Always compare CROSS_COMPILING explicitly to "YES"
This commit is contained in:
parent
5cf5db763f
commit
47ef127cb4
@ -40,7 +40,7 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix
|
||||
# warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
|
||||
# aid=2912630&group_id=11795&atid=311795>
|
||||
|
||||
.IF "$(CROSS_COMPILING)"==""
|
||||
.IF "$(CROSS_COMPILING)"!="YES"
|
||||
|
||||
.IF "$(OS)" == "WNT"
|
||||
.IF "$(COM)" == "MSC"
|
||||
|
2
external/gcc3_specific/makefile.mk
vendored
2
external/gcc3_specific/makefile.mk
vendored
@ -11,7 +11,7 @@ TARGET=gcc3_specific
|
||||
|
||||
.IF "$(GUI)" == "WNT"
|
||||
|
||||
.IF "$(CROSS_COMPILING)" == ""
|
||||
.IF "$(CROSS_COMPILING)" != "YES"
|
||||
# Don't do any of this weird and presumably obsolete crack when
|
||||
# cross-compiling
|
||||
|
||||
|
2
external/mingwheaders/makefile.mk
vendored
2
external/mingwheaders/makefile.mk
vendored
@ -33,7 +33,7 @@ TARGET=mingwheaders
|
||||
|
||||
.IF "$(OS)$(COM)" == "WNTGCC"
|
||||
|
||||
.IF "$(CROSS_COMPILING)" == ""
|
||||
.IF "$(CROSS_COMPILING)" != "YES"
|
||||
# Don't do any of this weird and presumably obsolete crack when
|
||||
# cross-compiling
|
||||
|
||||
|
@ -99,8 +99,8 @@ BUILD_ACTION=dmake
|
||||
OUT2INC += hyphen.h
|
||||
.ENDIF # "$(GUI)"=="WNT"
|
||||
|
||||
.IF "$(CROSS_COMPILING)"!=""
|
||||
CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
|
||||
.IF "$(CROSS_COMPILING)"=="YES"
|
||||
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
|
||||
.ENDIF
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
@ -67,8 +67,8 @@ CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
|
||||
.IF "$(OS)"=="IOS"
|
||||
CONFIGURE_FLAGS+= --disable-shared
|
||||
.ENDIF
|
||||
.IF "$(CROSS_COMPILING)"!=""
|
||||
CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
|
||||
.IF "$(CROSS_COMPILING)"=="YES"
|
||||
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
|
||||
.ENDIF
|
||||
|
||||
BUILD_ACTION=make
|
||||
|
@ -59,7 +59,7 @@ OOO_PATCH_FILES= \
|
||||
$(TARFILE_NAME).patch.win32 \
|
||||
raptor-aix.patch
|
||||
|
||||
.IF "$(CROSS_COMPILING)"!=""
|
||||
.IF "$(CROSS_COMPILING)"=="YES"
|
||||
OOO_PATCH_FILES += \
|
||||
$(TARFILE_NAME).patch.cross
|
||||
.ENDIF
|
||||
@ -145,7 +145,7 @@ CONFIGURE_FLAGS=--disable-static
|
||||
.ENDIF
|
||||
# do not enable grddl parser (#i93768#)
|
||||
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
|
||||
.IF "$(CROSS_COMPILING)"!=""
|
||||
.IF "$(CROSS_COMPILING)"=="YES"
|
||||
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
|
||||
.ENDIF
|
||||
BUILD_ACTION=$(GNUMAKE)
|
||||
|
@ -130,7 +130,7 @@ CONFIGURE_FLAGS=--disable-shared
|
||||
CONFIGURE_FLAGS=--disable-static
|
||||
.ENDIF
|
||||
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
|
||||
.IF "$(CROSS_COMPILING)"!=""
|
||||
.IF "$(CROSS_COMPILING)"=="YES"
|
||||
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
|
||||
.ENDIF
|
||||
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
|
||||
|
@ -134,7 +134,7 @@ CONFIGURE_FLAGS=--disable-shared
|
||||
CONFIGURE_FLAGS=--disable-static
|
||||
.ENDIF
|
||||
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
|
||||
.IF "$(CROSS_COMPILING)"!=""
|
||||
.IF "$(CROSS_COMPILING)"=="YES"
|
||||
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
|
||||
.ENDIF
|
||||
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
|
||||
|
Loading…
x
Reference in New Issue
Block a user