Fix ipodpatcher on OS X.
Fix a typo and update CC handling for OS X.
Change-Id: Icde3cb5956ffe45ee1d610ff34957ed7b17f3f02
diff --git a/rbutil/ipodpatcher/Makefile b/rbutil/ipodpatcher/Makefile
index 0b0b404..382423b 100644
--- a/rbutil/ipodpatcher/Makefile
+++ b/rbutil/ipodpatcher/Makefile
@@ -28,7 +28,7 @@
endif
# additional frameworks to link on on OS X
-LDOPTS_OSX += -framework CoreFoundation -framework IOKit
+LDOPTS_OSX = -framework CoreFoundation -framework IOKit
LIBSOURCES = ipodpatcher.c fat32format.c arc4.c \
ipodio-posix.c ipodio-win32-scsi.c ipodio-win32.c
diff --git a/rbutil/libtools.make b/rbutil/libtools.make
index 44ed5fe..de70388 100644
--- a/rbutil/libtools.make
+++ b/rbutil/libtools.make
@@ -27,6 +27,8 @@
CFLAGS += -DVERSION=\""$(APPVERSION)"\"
TARGET_DIR ?= $(abspath .)/
+NATIVECC = gcc
+CC = gcc
CPPDEFINES=$(shell echo foo | $(CROSS)$(CC) -dM -E -)
# use POSIX/C99 printf on windows
CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
@@ -44,7 +46,7 @@
else
ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE)
COMPILETARGET = darwin
-LDOPTS += $(LDFLAGS_OSX)
+LDOPTS += $(LDOPTS_OSX)
else
COMPILETARGET = posix
endif
@@ -52,8 +54,6 @@
endif
$(info Compiler creates $(COMPILETARGET) binaries)
-NATIVECC ?= gcc
-CC ?= gcc
# OS X specifics. Needs to consider cross compiling for Windows.
ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE)
# when building libs for OS X build for both i386 and ppc at the same time.
@@ -62,9 +62,9 @@
CFLAGS += -arch ppc -arch i386
# 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
+CC = gcc-4.0
CFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4
-NATIVECC ?= gcc-4.0
+NATIVECC = gcc-4.0
endif
WINDRES = windres