From d20b9ff3ee0f1014a740baed908dc0a08c646fb6 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Mon, 2 Nov 2015 08:32:21 -0600 Subject: Don't pass target $CFLAGS to host builds (telling x86 compiler to be big-endian seldom ends well). Instead add -DBUILD_FOR_HOST to $HOSTCC and wrap #ifdefs around problematic (smack) includes from toys.h. --- configure | 1 + lib/lsm.h | 4 ++++ scripts/make.sh | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 7b10f6e5..ff1aaf24 100644 --- a/configure +++ b/configure @@ -23,3 +23,4 @@ CFLAGS="$CFLAGS -funsigned-char" # If HOSTCC needs CFLAGS or LDFLAGS, just add them to the variable # ala HOSTCC="blah-cc --static" [ -z "$HOSTCC" ] && HOSTCC=cc +HOSTCC="$HOSTCC -DBUILD_FOR_HOST" diff --git a/lib/lsm.h b/lib/lsm.h index d7e7de9c..aacabe08 100644 --- a/lib/lsm.h +++ b/lib/lsm.h @@ -3,6 +3,8 @@ * Copyright 2015 Rob Landley */ +#ifndef BUILD_FOR_HOST + #if CFG_TOYBOX_SELINUX #include #else @@ -113,3 +115,5 @@ static inline int lsm_fget_context(int file, char **context) return smack_new_label_from_file(file, XATTR_NAME_SMACK, context); return fgetfilecon(file, context); } + +#endif // BUILD_FOR_HOST diff --git a/scripts/make.sh b/scripts/make.sh index a724d5f7..3dd4f90c 100755 --- a/scripts/make.sh +++ b/scripts/make.sh @@ -213,7 +213,7 @@ fi echo "generated/help.h" if [ generated/config2help -ot scripts/config2help.c ] then - do_loudly $HOSTCC scripts/config2help.c $CFLAGS -I . lib/xwrap.c lib/llist.c \ + do_loudly $HOSTCC scripts/config2help.c -I . lib/xwrap.c lib/llist.c \ lib/lib.c lib/portability.c -o generated/config2help || exit 1 fi generated/config2help Config.in $KCONFIG_CONFIG > generated/help.h || exit 1 -- cgit v1.2.3