diff options
| author | Ying Wang <wangying@google.com> | 2012-11-12 14:45:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-12 14:45:59 -0800 |
| commit | eb98e088937c4568f75d965dee1ef8d5c6689213 (patch) | |
| tree | f8d928ddd5e8f3a82b36fcd6a0e0086dff141564 /core/combo/HOST_darwin-x86.mk | |
| parent | abfb25226aabdbda7f8900e923754beb7f8cb94d (diff) | |
| parent | 865d851a8012e13c35d573d98770b7187d32b7f7 (diff) | |
| download | build-eb98e088937c4568f75d965dee1ef8d5c6689213.zip build-eb98e088937c4568f75d965dee1ef8d5c6689213.tar.gz build-eb98e088937c4568f75d965dee1ef8d5c6689213.tar.bz2 | |
am 865d851a: Merge "Remove the obsolete comments and change the misleading var name."
* commit '865d851a8012e13c35d573d98770b7187d32b7f7':
Remove the obsolete comments and change the misleading var name.
Diffstat (limited to 'core/combo/HOST_darwin-x86.mk')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 1777841..7361ce9 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -75,11 +75,11 @@ else endif HOST_TOOLCHAIN_ROOT := prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1 -HOST_SDK_TOOLCHAIN_PREFIX := $(HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin$(gcc_darwin_version) +HOST_TOOLCHAIN_PREFIX := $(HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin$(gcc_darwin_version) # Don't do anything if the toolchain is not there -ifneq (,$(strip $(wildcard $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc))) -HOST_CC := $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc -HOST_CXX := $(HOST_SDK_TOOLCHAIN_PREFIX)-g++ +ifneq (,$(strip $(wildcard $(HOST_TOOLCHAIN_PREFIX)-gcc))) +HOST_CC := $(HOST_TOOLCHAIN_PREFIX)-gcc +HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)-g++ ifeq ($(mac_sdk_version),10.8) # Mac SDK 10.8 no longer has stdarg.h, etc host_toolchain_header := $(HOST_TOOLCHAIN_ROOT)/lib/gcc/i686-apple-darwin$(gcc_darwin_version)/4.2.1/include @@ -88,7 +88,7 @@ endif else HOST_CC := gcc HOST_CXX := g++ -endif # $(HOST_SDK_TOOLCHAIN_PREFIX)-gcc exists +endif # $(HOST_TOOLCHAIN_PREFIX)-gcc exists HOST_AR := $(AR) HOST_STRIP := $(STRIP) HOST_STRIP_COMMAND = $(HOST_STRIP) --strip-debug $< -o $@ |