summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-05-01 21:43:44 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-05-01 21:43:44 +0200
commit5c5b24f4139bbce45beb31473247d550520035d1 (patch)
tree881c7a3132f38fa6b9750608be3cdd1faf25d966
parentc183c3289ae64824a5b58810da27da6487c83ea1 (diff)
use HOST_CFLAGS for Kconfig and adk tools
-rw-r--r--adk/config/Makefile2
-rw-r--r--mk/build.mk6
-rw-r--r--scripts/scan-tools.sh1
3 files changed, 6 insertions, 3 deletions
diff --git a/adk/config/Makefile b/adk/config/Makefile
index b6c253f18..989dbeee8 100644
--- a/adk/config/Makefile
+++ b/adk/config/Makefile
@@ -1,6 +1,8 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
+include ${ADK_TOPDIR}/prereq.mk
+
ifneq ($(filter-out clean,${MAKECMDGOALS}),)
include ${ADK_TOPDIR}/rules.mk
endif
diff --git a/mk/build.mk b/mk/build.mk
index 992a967cf..76915221a 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -561,13 +561,13 @@ buildall:
$(GMAKE) ADK_VERBOSE=1 all 2>&1 | tee firmware/buildall.log
$(ADK_TOPDIR)/adk/tools/pkgmaker: $(ADK_TOPDIR)/adk/tools/pkgmaker.c $(ADK_TOPDIR)/adk/tools/sortfile.c $(ADK_TOPDIR)/adk/tools/strmap.c
- @$(HOST_CC) -O0 -g0 -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c
+ @$(HOST_CC) $(HOST_CFLAGS) -O0 -g0 -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c
$(ADK_TOPDIR)/adk/tools/pkgrebuild: $(ADK_TOPDIR)/adk/tools/pkgrebuild.c $(ADK_TOPDIR)/adk/tools/strmap.c
- @$(HOST_CC) -O0 -g0 -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c
+ @$(HOST_CC) $(HOST_CFLAGS) -O0 -g0 -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c
$(ADK_TOPDIR)/adk/tools/depmaker: $(ADK_TOPDIR)/adk/tools/depmaker.c
- @$(HOST_CC) -O0 -g0 -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c
+ $(HOST_CC) $(HOST_CFLAGS) -O0 -g0 -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c
menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild $(wildcard target/appliances/*)
@echo "Generating menu structure ..."
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 9ec5dcfc5..7e27f4014 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -100,6 +100,7 @@ X=$($makecmd ADK_TOPDIR=$topdir LDADD=-lgcc 2>&1)
if [[ $X != *@(Native compiler works)* ]]; then
echo Cannot compile with shared libgcc use static one.
HOST_CFLAGS=-static-libgcc
+ echo "HOST_CFLAGS:=-static-libgcc" >> $topdir/prereq.mk
fi
X=$($makecmd ADK_TOPDIR=$topdir HOST_CFLAGS=${HOST_CFLAGS} 2>&1)