r1093 - trunk

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed May 30 15:36:40 EDT 2007


Author: coyote
Date: 2007-05-30 15:36:40 -0400 (Wed, 30 May 2007)
New Revision: 1093

Modified:
   trunk/Makefile
Log:
Changes for SunOS: grep -q doesn't work on SunOS and GNU make on SunOS defines CC as 'cc' by default (it's not present).


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-05-29 21:51:37 UTC (rev 1092)
+++ trunk/Makefile	2007-05-30 19:36:40 UTC (rev 1093)
@@ -52,10 +52,17 @@
 endif
 
 ifndef CC
-CC=gcc
+  CC=gcc
 endif
-CC_IS_GCC=$(shell $(CC) --version | grep -q "(GCC)" && echo 1)
 
+ifeq ($(PLATFORM),sunos)
+  # GNU make on SunOS defines CC as 'cc'. 'grep -q' is not an option on SunOS.
+  CC=gcc
+  CC_IS_GCC=1
+else
+  CC_IS_GCC=$(shell $(CC) --version | grep -q "(GCC)" && echo 1)
+endif
+
 ifeq ($(ARCH),powerpc)
   ARCH=ppc
 endif




More information about the quake3-commits mailing list