From 5144e567843dd498793131dd0411c9713885be45 Mon Sep 17 00:00:00 2001 From: deuce <> Date: Wed, 19 May 2004 00:35:43 +0000 Subject: [PATCH] Must now set DONT_CLOBER_CC to use the predefined CC value. (Keeps things out of cc.* and back in gcc.*) --- src/xpdev/Common.gmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/xpdev/Common.gmake b/src/xpdev/Common.gmake index 29e2274e61..5fd53b6506 100644 --- a/src/xpdev/Common.gmake +++ b/src/xpdev/Common.gmake @@ -16,14 +16,22 @@ endif # Compiler-specific options CFLAGS += -MMD ifdef BUILD_DEPENDS - CC ?= gcc + ifdef DONT_CLOBBER_CC + CC ?= gcc + else + CC := gcc + endif CCPRE := $(CC) CC := $(XPDEV)/../build/mkdep -a CXX := $(XPDEV)/../build/mkdep -a LD := echo COMPILE_MSG := Depending else - CC ?= gcc + ifdef DONT_CLOBBER_CC + CC ?= gcc + else + CC ?= gcc + endif CCPRE := $(CC) CXX ?= g++ LD ?= ld -- GitLab