cross-build: Add common compatibility headers after OS-specific ones
The current order is rather counter-intuitive and it appears to work fine if we swap the order. Pull Request: https://github.com/freebsd/freebsd-src/pull/725 Reviewed by: imp
This commit is contained in:
parent
6763332969
commit
b347c22846
@ -35,7 +35,6 @@ LIBZ:=${WORLDTMP}/legacy/usr/lib/libz.a
|
|||||||
CFLAGS+= -Werror=implicit-function-declaration -Werror=implicit-int \
|
CFLAGS+= -Werror=implicit-function-declaration -Werror=implicit-int \
|
||||||
-Werror=return-type -Wundef
|
-Werror=return-type -Wundef
|
||||||
CFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1
|
CFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1
|
||||||
CFLAGS+= -I${SRCTOP}/tools/build/cross-build/include/common
|
|
||||||
# This is needed for code that compiles for pre-C11 C standards
|
# This is needed for code that compiles for pre-C11 C standards
|
||||||
CWARNFLAGS.clang+=-Wno-typedef-redefinition
|
CWARNFLAGS.clang+=-Wno-typedef-redefinition
|
||||||
# bsd.sys.mk explicitly turns on -Wsystem-headers, but that's extremely
|
# bsd.sys.mk explicitly turns on -Wsystem-headers, but that's extremely
|
||||||
@ -69,6 +68,11 @@ CFLAGS+= -idirafter ${SRCTOP}/contrib/libarchive/libarchive
|
|||||||
.endif
|
.endif
|
||||||
.endif # ${.MAKE.OS} != "FreeBSD"
|
.endif # ${.MAKE.OS} != "FreeBSD"
|
||||||
|
|
||||||
|
.if ${.MAKE.OS} != "FreeBSD"
|
||||||
|
# Add the common compatibility headers after the OS-specific ones.
|
||||||
|
CFLAGS+= -I${SRCTOP}/tools/build/cross-build/include/common
|
||||||
|
.endif
|
||||||
|
|
||||||
# we do not want to capture dependencies referring to the above
|
# we do not want to capture dependencies referring to the above
|
||||||
UPDATE_DEPENDFILE= no
|
UPDATE_DEPENDFILE= no
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user