summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/chinachippatcher/Makefile1
-rw-r--r--rbutil/libtools.make2
2 files changed, 2 insertions, 1 deletions
diff --git a/rbutil/chinachippatcher/Makefile b/rbutil/chinachippatcher/Makefile
index cdcca865b0..390260ebfd 100644
--- a/rbutil/chinachippatcher/Makefile
+++ b/rbutil/chinachippatcher/Makefile
@@ -7,7 +7,6 @@
# $Id$
#
CFLAGS = -g -Wall
-CC = gcc
OUTPUT = chinachippatcher
diff --git a/rbutil/libtools.make b/rbutil/libtools.make
index d25a97127c..4e66161011 100644
--- a/rbutil/libtools.make
+++ b/rbutil/libtools.make
@@ -45,12 +45,14 @@ endif
NATIVECC = gcc
CC ?= gcc
ifeq ($(findstring Darwin,$(shell uname)),Darwin)
+ifneq ($(findstring mingw,$(CROSS)$(CC)),mingw)
# building against SDK 10.4 is not compatible with gcc-4.2 (default on newer Xcode)
# might need adjustment for older Xcode.
CC ?= gcc-4.0
CFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4
NATIVECC ?= gcc-4.0
endif
+endif
WINDRES = windres
BUILD_DIR ?= $(TARGET_DIR)build