Changeset a2011ad in freewrt

Timestamp:

Jun 12, 2006, 1:09:53 AM (20 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

8ec9389

Parents:

abfbcd7

Message:

Correctly determine HOSTCC and HOSTCFLAGS (from host make)
and pass them as CC/CFLAGS to the toolchain as well.

Now this at least goes as far as I suspected the first
breakage would be (on MirBSD) - autotools.

Detecting works by invoking $(MAKE) with a BSD-specific
makefile and just using $(HOSTCFLAGS) if that fails.
This works better on OpenBSD too, FWIW.

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

Files:

• Makefile (modified) (1 diff)
• build.mk (modified) (1 diff)
• package/config/Makefile (modified) (2 diffs)

Makefile

@@ -33 +33 @@
 GMAKE_INV=      PATH=$(PWD)/lbin:$(PATH) ${GMAKE} -f $(PWD)/build.mk ${VARS_TO_PASS}
 
-VARS_TO_PASS=   HOSTCC='${CC}' MAKE='${GMAKE}'
+VARS_TO_PASS=   HOSTCC='${CC}' MAKE='${GMAKE}' \
+                HOSTCFLAGS="$$(x=$$(echo \
+                    'f:\n\techo P:$${CFLAGS}\n.include <bsd.prog.mk>' | \
+                    ${MAKE} -f - f EXPERIMENTAL=yes 2>/dev/null | grep '^P:' \
+                    2>/dev/null | sed 's/^P://'); echo $${x:-${CFLAGS}})"
 
 all: prereq

build.mk

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

package/config/Makefile

@@ -6 +6 @@
 
 # Select the compiler needed to build binaries for your development system
-HOSTCC    = gcc
-HOSTCFLAGS= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCC    ?= gcc
+HOSTCFLAGS?= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
 # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc.
 LC_ALL:= C
@@ -95 +95 @@
 ncurses:
         @echo "main() {}" > lxtemp.c
-        @if $(HOSTCC) lxtemp.c $(LIBS) ; then \
+        @if $(HOSTCC) $(HOSTCFLAGS) lxtemp.c $(LIBS) ; then \
                 rm -f lxtemp.c a.out; \
         else \