Changeset 6ffb3bf in freewrt

Timestamp:

Jun 13, 2006, 2:36:59 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

b59603f

Parents:

2bdf580

Message:

uClibc is not part of the toolchain, even if it's
contained in the toolchain/ directory, so it doesn't
build with CC=$(HOSTCC), change that and don't pass
it the variables (even if CC=$(TARGET_CC) is passed,
it doesn't build - but then, uClibc's build system
is so broken in other regards...)

Full build (make v) succeeded on GNU/Linux:
-rw-r--r-- 1 tg freewrt 4706440 Jun 13 14:32 make.log

Didn't attach the build log because of its sheer size ;)

Bug catched by wbx@

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@62 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• build.mk (modified) (1 diff)
• toolchain/Makefile (modified) (3 diffs)

build.mk

@@ -81 +81 @@
 toolchain/%:
         @$(TRACE) $@
-        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@) \
-            CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)'
+        $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
 #############################################################

toolchain/Makefile

@@ -33 +33 @@
         @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
                 $(TRACE) toolchain/$(patsubst %-prepare,%,$@)/prepare; \
-                $(MAKE) -C $(patsubst %-prepare,%,$@) prepare $(MAKE_TRACE); \
+                ${SET_DASHX}; \
+                if test x"$(patsubst %-prepare,%,$@)" = x"uClibc"; then \
+                        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare \
+                            $(MAKE_TRACE); \
+                else \
+                        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare \
+                            CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)' \
+                            $(MAKE_TRACE); \
+                fi; \
         }
         @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
@@ -40 +48 @@
         @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
                 $(TRACE) toolchain/$(patsubst %-compile,%,$@)/compile; \
-                $(MAKE) -C $(patsubst %-compile,%,$@) compile $(MAKE_TRACE); \
+                ${SET_DASHX}; \
+                if test x"$(patsubst %-compile,%,$@)" = x"uClibc"; then \
+                        $(MAKE) -C $(patsubst %-compile,%,$@) compile \
+                            $(MAKE_TRACE); \
+                else \
+                        $(MAKE) -C $(patsubst %-compile,%,$@) compile \
+                            CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)' \
+                            $(MAKE_TRACE); \
+                fi; \
         }
         @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@
@@ -47 +63 @@
         @[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
                 $(TRACE) toolchain/$(patsubst %-install,%,$@)/install; \
-                $(MAKE) -C $(patsubst %-install,%,$@) install $(MAKE_TRACE); \
+                ${SET_DASHX}; \
+                if test x"$(patsubst %-install,%,$@)" = x"uClibc"; then \
+                        $(MAKE) -C $(patsubst %-install,%,$@) install \
+                            $(MAKE_TRACE); \
+                else \
+                        $(MAKE) -C $(patsubst %-install,%,$@) install \
+                            CC='$(HOSTCC)' CFLAGS='$(HOSTCFLAGS)' \
+                            $(MAKE_TRACE); \
+                fi; \
         }
         @touch $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@