summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/build.mk6
-rw-r--r--mk/vars.mk2
-rw-r--r--scripts/scan-tools.sh6
3 files changed, 8 insertions, 6 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 76915221a..8bec78bb9 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) $(HOST_CFLAGS) -O0 -g0 -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c
+ @$(HOST_CC) $(HOST_CFLAGS) -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) $(HOST_CFLAGS) -O0 -g0 -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c
+ @$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c
$(ADK_TOPDIR)/adk/tools/depmaker: $(ADK_TOPDIR)/adk/tools/depmaker.c
- $(HOST_CC) $(HOST_CFLAGS) -O0 -g0 -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c
+ @$(HOST_CC) $(HOST_CFLAGS) -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/mk/vars.mk b/mk/vars.mk
index e73cdc698..3dc51948a 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -280,8 +280,6 @@ endif
# host compiler and linker flags
HOST_CPPFLAGS:= -I$(STAGING_HOST_DIR)/usr/include
-HOST_CFLAGS:= -O0 -g0
-HOST_CXXFLAGS:= -O0 -g0
HOST_LDFLAGS:= -L$(STAGING_HOST_DIR)/usr/lib -Wl,-rpath -Wl,${STAGING_HOST_DIR}/usr/lib
PATCH= PATH='${HOST_PATH}' ${BASH} $(SCRIPT_DIR)/patch.sh
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 7e27f4014..7c0e89cea 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -100,7 +100,11 @@ 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
+ echo "HOST_CFLAGS:=-O0 -g0 -static-libgcc" >> $topdir/prereq.mk
+ echo "HOST_CXXFLAGS:=-O0 -g0 -static-libgcc" >> $topdir/prereq.mk
+else
+ echo "HOST_CFLAGS:=-O0 -g0" >> $topdir/prereq.mk
+ echo "HOST_CXXFLAGS:=-O0 -g0" >> $topdir/prereq.mk
fi
X=$($makecmd ADK_TOPDIR=$topdir HOST_CFLAGS=${HOST_CFLAGS} 2>&1)