Skip to contentSkip to conversation

config.mk: use different host compiler for OS X 10.6

PATCH New Andreas Bießmann 3 participants 3 messages May 22, 2010 – May 26, 2010

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 config.mk: use different host compiler for OS X 10.6

Compiling tools subdirectory on Mac OS X 10.6 (Snow Leopard) complains about wrong syntax in system includes.

In file included from /usr/include/stdio.h:444,

                 from ../source/u-boot/include/compiler.h:26,
                 from ../source/u-boot/lib/crc32.c:15:

/usr/include/secure/_stdio.h:46: error: syntax error in macro parameter list

This can be fixed by reverting the workaround for prior OS X releases in config.mk conditionally for OS X 10.6+.

---
 config.mk |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
config.mk +11 -3
index 73b5195..c4ad223 100644
@@ -64,9 +64,17 @@ HOSTSTRIP	= strip
 #
 
 ifeq ($(HOSTOS),darwin)
-HOSTCC		= cc
-HOSTCFLAGS	+= -traditional-cpp
-HOSTLDFLAGS	+= -multiply_defined suppress
+# get major and minor product version (e.g. '10' and '6' for Snow Leopard)
+DARWIN_MAJOR_VERSION	= $(shell sw_vers -productVersion | cut -f 1 -d '.')
+DARWIN_MINOR_VERSION	= $(shell sw_vers -productVersion | cut -f 2 -d '.')
+
+before-snow-leopard	= $(shell if [ $(DARWIN_MAJOR_VERSION) -le 10 -a \
+	$(DARWIN_MINOR_VERSION) -le 5 ] ; then echo "$(1)"; else echo "$(2)"; fi ;)
+
+# Snow Leopards build environment has no longer restrictions as described above
+HOSTCC		 = $(call before-snow-leopard, "cc", "gcc")
+HOSTCFLAGS	+= $(call before-snow-leopard, "-traditional-cpp")
+HOSTLDFLAGS	+= $(call before-snow-leopard, "-multiply_defined suppress")
 else
 HOSTCC		= gcc
 endif
Signature · 1 line
1.7.1
#1 lore raw

PATCH v2 1/1 config.mk: use different host compiler for OS X 10.6

config.mk HOSTSTRIP = strip · line 77

Quoted 11 lines · On Saturday 22 May 2010 07:17:21 Andreas Bie?mann wrote:
config.mk +6 -0
+# get major and minor product version (e.g. '10' and '6' for Snow Leopard)
+DARWIN_MAJOR_VERSION	= $(shell sw_vers -productVersion | cut -f 1 -d '.')
+DARWIN_MINOR_VERSION	= $(shell sw_vers -productVersion | cut -f 2 -d '.')
+
+before-snow-leopard	= $(shell if [ $(DARWIN_MAJOR_VERSION) -le 10 -a \
+	$(DARWIN_MINOR_VERSION) -le 5 ] ; then echo "$(1)"; else echo "$(2)"; fi

;) +
+# Snow Leopards build environment has no longer restrictions as described
above +HOSTCC = $(call before-snow-leopard, "cc", "gcc")

config.mk +2 -0
+HOSTCFLAGS	+= $(call before-snow-leopard, "-traditional-cpp")
+HOSTLDFLAGS	+= $(call before-snow-leopard, "-multiply_defined suppress")

it stinks that the make language isnt more flexible, but given the limitations of it, this looks OK to me. thanks !

-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20100522/86a2fc49/attachment.pgp

#2 lore raw

PATCH v2 1/1 config.mk: use different host compiler for OS X 10.6

In reply to Andreas Bießmann

Dear Andreas Bie?mann,

Quoted 8 lines · In message <[email protected]>…

Compiling tools subdirectory on Mac OS X 10.6 (Snow Leopard) complains about wrong syntax in system includes.

In file included from /usr/include/stdio.h:444,

                 from ../source/u-boot/include/compiler.h:26,
                 from ../source/u-boot/lib/crc32.c:15:

/usr/include/secure/_stdio.h:46: error: syntax error in macro parameter list

Quoted 7 lines

This can be fixed by reverting the workaround for prior OS X releases in config.mk conditionally for OS X 10.6+.

---
 config.mk |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

Applied,t hanks.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Time is an illusion perpetrated by the manufacturers of space.