From 7388d8df0677db3cff3f69598da8931517c8e2b4 Mon Sep 17 00:00:00 2001
From: Torrey Lyons <torrey@mrcla.com>
Date: Thu, 9 Dec 2004 22:49:43 +0000
Subject: Fix building with Apple gcc newer than version 3.3.

---
 darwin.cf | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'darwin.cf')

diff --git a/darwin.cf b/darwin.cf
index 48a5409..96b5484 100644
--- a/darwin.cf
+++ b/darwin.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/darwin.cf,v 1.4 2004/09/02 01:23:45 kem Exp $
+XCOMM $XdotOrg: xc/config/cf/darwin.cf,v 1.5 2004/10/30 01:41:46 torrey Exp $
 XCOMM platform:  $XFree86: xc/config/cf/darwin.cf,v 1.50 2004/01/20 23:54:50 torrey Exp $
 
 /* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */
@@ -157,15 +157,17 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 
 /*
  * Our cpp isn't in /lib/cpp and early versions don't like -undef.
- * The default cpp-3.3 that ships with Panther inserts spurious #pragmas,
- * so we use the 3.1-based version.
+ * The gcc 3.3 cpp that Apple ships inserts spurious #pragmas,
+ * so we use the 3.1-based version in this case.
  */
-#if OSMajorVersion >= 7
+#if (GccMajorVersion == 3) && (GccMinorVersion == 3)
 # define CppCmd                 /usr/bin/cpp3
-# define StandardCppOptions     -traditional -D__GNUC__
 #else
 # define CppCmd                 /usr/bin/cpp
 #endif
+#if (GccMajorVersion == 3) && (GccMinorVersion == 3) || (GccMajorVersion > 3)
+# define StandardCppOptions     -traditional -D__GNUC__
+#endif
 #if HasGcc3
 # define RawCppCmd              CppCmd -undef
 #else
@@ -290,15 +292,15 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #ifndef BundleProgramTarget
 #define BundleProgramTarget(program,loader,subdirs,objs,deplib,syslib,dstdir) @@\
                                                                         @@\
-AllTarget(program)							@@\
-									@@\
-program: loader subdirs objs deplib					@@\
-	RemoveTargetProgram($@)						@@\
+AllTarget(program)                                                      @@\
+                                                                        @@\
+program: loader subdirs objs deplib                                     @@\
+	RemoveTargetProgram($@)                                             @@\
 	LinkRule($@,-bundle $(LDOPTIONS),objs,deplib $(LDLIBS) syslib -bundle_loader loader) @@\
-									@@\
-InstallProgram(program,dstdir/program.bundle/Contents/MacOS)		@@\
-									@@\
-clean::									@@\
+                                                                        @@\
+InstallProgram(program,dstdir/program.bundle/Contents/MacOS)            @@\
+                                                                        @@\
+clean::                                                                 @@\
 	RemoveFile(program)
 #endif /* BundleProgramTarget */
 
@@ -311,6 +313,5 @@ clean::									@@\
 	darwinLib.tmpl
 #endif
 
-/* include all the XFree86 rules */
+/* include all the X.Org rules */
 #include <xorg.cf>
-
-- 
cgit v1.2.3