From dd7bc6296440188bdf6ff106086f6d7aaade0290 Mon Sep 17 00:00:00 2001
From: rtoy <rtoy>
Date: Wed, 17 Aug 2005 03:41:50 +0000
Subject: [PATCH] Change CC to gcc so we can use the default version on both
 Mac OS X 10.2 and 10.4.  However, we need to compile all assembly files with
 -traditional to concatenate tokens the way we want.  (Appears to be an issue
 with gcc 4.0 included with Tiger.)

---
 lisp/Config.ppc_darwin | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/Config.ppc_darwin b/lisp/Config.ppc_darwin
index cba98dcdf..ea1b576a4 100644
--- a/lisp/Config.ppc_darwin
+++ b/lisp/Config.ppc_darwin
@@ -3,7 +3,12 @@ vpath %.h $(PATH1)
 vpath %.c $(PATH1)
 vpath %.S $(PATH1)
 CPPFLAGS = -I. -I$(PATH1) -I/usr/X11R6/include
-CC = gcc3
+# For Mac OS X 10.2, gcc3 is appropriate.  For 10.4, gcc (gcc 4.0) is ok.  But
+# this means -traditional is needed because gcc 4 seems to handle '##'
+# differently from gcc-3.3.  I (rtoy) don't know which is right, but I
+# think gcc 4 is wrong.  However, to work around this, we use /**/ to 
+# concatenate tokens which reguires the -traditional flag.
+CC = gcc
 LD = ld
 NM = $(PATH1)/darwin-nm
 CPP = cpp -no-cpp-precomp
@@ -13,7 +18,7 @@ LINKAGE = -DLINKAGE_TABLE
 endif
 
 CFLAGS = -g -O3 -no-cpp-precomp -DDARWIN -Dppc $(LINKAGE)
-ASFLAGS = -g -O3 -no-cpp-precomp -DDARWIN -Dppc $(LINKAGE)
+ASFLAGS = -traditional -g -O3 -no-cpp-precomp -DDARWIN -Dppc $(LINKAGE)
 
 UNDEFSYMPATTERN = -Xlinker -u -Xlinker &
 ASSEM_SRC = ppc-assem.S linux-stubs.S
-- 
GitLab