diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-04-05 20:03:45 +0200 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-04-05 20:03:45 +0200 |
| commit | 703bc407b4565736eb1c40f85887c84c33e37696 (patch) | |
| tree | 5be967527bb217538e78c2aadfd5284b40d2fcf8 /rbutil | |
| parent | ea0bfe7520742ac5dec97c6ac4cdc54d2410445c (diff) | |
Fix ipodpatcher on OS X.
Fix a typo and update CC handling for OS X.
Change-Id: Icde3cb5956ffe45ee1d610ff34957ed7b17f3f02
Diffstat (limited to 'rbutil')
| -rw-r--r-- | rbutil/ipodpatcher/Makefile | 2 | ||||
| -rw-r--r-- | rbutil/libtools.make | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/rbutil/ipodpatcher/Makefile b/rbutil/ipodpatcher/Makefile index 0b0b404ca2..382423b4f2 100644 --- a/rbutil/ipodpatcher/Makefile +++ b/rbutil/ipodpatcher/Makefile @@ -28,7 +28,7 @@ CFLAGS += -DWITH_BOOTOBJS 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 44ed5fef3d..de70388010 100644 --- a/rbutil/libtools.make +++ b/rbutil/libtools.make @@ -27,6 +27,8 @@ APPVERSION ?= $(shell $(TOP)/../tools/version.sh $(TOP)/..) 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 @@ COMPILETARGET = mingw else ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) COMPILETARGET = darwin -LDOPTS += $(LDFLAGS_OSX) +LDOPTS += $(LDOPTS_OSX) else COMPILETARGET = posix endif @@ -52,8 +54,6 @@ endif 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 @@ ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) 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 |