r1095 - trunk

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Jun 2 11:26:30 EDT 2007


Author: tma
Date: 2007-06-02 11:26:30 -0400 (Sat, 02 Jun 2007)
New Revision: 1095

Modified:
   trunk/Makefile
Log:
* Assumptions are already made that the compiler used is GCC, so it seems silly
  to make per-platform exceptions in order to make the IS_GCC test work. Instead
  just rely on $(CC) being set by the system (i.e. make) and it being GCC. If
  this causes problems on any platforms please discuss it on the mailing list
  or IRC


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-05-30 20:11:37 UTC (rev 1094)
+++ trunk/Makefile	2007-06-02 15:26:30 UTC (rev 1095)
@@ -51,18 +51,6 @@
 ARCH=$(COMPILE_ARCH)
 endif
 
-ifndef CC
-  CC=gcc
-endif
-
-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
@@ -775,9 +763,7 @@
 endif
 
 ifeq ($(GENERATE_DEPENDENCIES),1)
-  ifeq ($(CC_IS_GCC),1)
-    DEPEND_CFLAGS=-MMD
-  endif
+  DEPEND_CFLAGS=-MMD
 endif
 
 ifeq ($(USE_SVN),1)




More information about the quake3-commits mailing list