diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-01-27 16:22:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-27 16:22:16 -0800 |
| commit | 2e2feaf9bfb01be773dad675d42d3e8b061f3f0a (patch) | |
| tree | 8368692099f45878e4ecaf9df94ffc571d706a13 | |
| parent | 104935a0dd8857593f6f127da1d67d435b7348b0 (diff) | |
| parent | d9b8b90d6ea878ddb89c0f9affeb2b52767cdbd9 (diff) | |
| download | external_qemu-2e2feaf9bfb01be773dad675d42d3e8b061f3f0a.zip external_qemu-2e2feaf9bfb01be773dad675d42d3e8b061f3f0a.tar.gz external_qemu-2e2feaf9bfb01be773dad675d42d3e8b061f3f0a.tar.bz2 | |
am d9b8b90d: merge from open-source master
Merge commit 'd9b8b90d6ea878ddb89c0f9affeb2b52767cdbd9'
* commit 'd9b8b90d6ea878ddb89c0f9affeb2b52767cdbd9':
Force gcc-4.0 for qemu build on Mac OS X
| -rw-r--r-- | Makefile.android | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.android b/Makefile.android index a9939c1..02518e3 100644 --- a/Makefile.android +++ b/Makefile.android @@ -9,6 +9,8 @@ CONFIG_DIRS := \ CONFIG_INCLUDES := $(CONFIG_DIRS:%=-I%) +MY_CC := $(HOST_CC) + MY_OPTIM := -O2 -g -fno-PIC -falign-functions=0 -fomit-frame-pointer ifeq ($(BUILD_DEBUG_EMULATOR),true) MY_OPTIM := -O0 -g @@ -62,9 +64,16 @@ ifeq ($(HOST_OS),darwin) endif MY_CFLAGS += -isysroot $(TIGER_SDK) -mmacosx-version-min=10.4 -DMACOSX_DEPLOYMENT_TARGET=10.4 MY_LDLIBS += -isysroot $(TIGER_SDK) -Wl,-syslibroot,$(TIGER_SDK) -mmacosx-version-min=10.4 + + # Beginning with Snow Leopard, the default compiler is GCC 4.2 + # which is incompatible with the 10.4 SDK, so we must + # specify the use of GCC 4.0. + ifeq ($(filter 10.5 10.5.%,$(DARWIN_VERSION)),) + # We are on Snow Leopard or above + MY_CC := gcc-4.0 + endif endif endif -MY_CC := $(HOST_CC) # BUILD_STANDALONE_EMULATOR is only defined when building with # the android-rebuild.sh script. The script will also provide |