Don't add include dir in CFLAGS for all libraries.

Causes already installed headers to be used when re-building, which might be out of date.

Author: triplef

env/toolchain.sh

@@ -16,10 +16,6 @@ export RANLIB="${TOOLCHAIN}"/bin/${ANDROID_TARGET_BINUTILS}-ranlib
 export STRIP="${TOOLCHAIN}"/bin/${ANDROID_TARGET_BINUTILS}-strip
 export PKG_CONFIG_PATH="${INSTALL_PREFIX}/lib/pkgconfig"
 
-# some libraries require this
-export CFLAGS="-I${INSTALL_PREFIX}/include"
-export CPPFLAGS="-I${INSTALL_PREFIX}/include"
-
 # -fuse-ld=gold required to work around BFD ld linker bugs on arm64 with gnustep-2.0 libobjc runtime
 # -rpath-link required for linker to find libcxxrt dependency of libobjc
 # --build-id=sha1 required for Android Studio to locate debug information

phases/40-gnustep-corebase.sh

@@ -16,7 +16,10 @@ echo "### Source GNUstep.sh"
 echo -e "\n### Running configure"
 ./configure \
   --host=${ANDROID_TARGET} \
-  --prefix="${INSTALL_PREFIX}"
+  --prefix="${INSTALL_PREFIX}" \
+  `# for some reason we need to manually specify the include dir` \
+  CFLAGS="${CFLAGS} -I${INSTALL_PREFIX}/include" \
+  CPPFLAGS="${CPPFLAGS} -I${INSTALL_PREFIX}/include" \
 
 echo -e "\n### Building"
 make -j${MAKE_JOBS} ${GNUSTEP_MAKE_OPTIONS}