diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-06 12:42:32 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-06 12:46:30 +0800 |
| commit | e2dcd65361418e184b40c77671a62b911cbe1185 (patch) | |
| tree | b3e72140a42d3b9d0e1673063bea6623af8f826b /toolchains | |
| parent | dd09fb8eb952ad800c795e2e131360842a697c4a (diff) | |
| download | ndk-e2dcd65361418e184b40c77671a62b911cbe1185.tar.gz | |
Fix ndk-build using windows/clang3.1 with -no-canonical-prefixes
With "-no-canonical-prefixes", clang not only doesn't resolve
argv[0] to real path (which we like in favor of distribute
build system), but also forget to add .exe for windows (which
is bad). Explicit adding .exe to fix it.
Change-Id: I18ff317b80d55eb3a6630391d916b1097b7a3e9b
Diffstat (limited to 'toolchains')
| -rw-r--r-- | toolchains/arm-linux-androideabi-clang3.1/setup.mk | 4 | ||||
| -rw-r--r-- | toolchains/mipsel-linux-android-clang3.1/setup.mk | 4 | ||||
| -rw-r--r-- | toolchains/x86-clang3.1/setup.mk | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/toolchains/arm-linux-androideabi-clang3.1/setup.mk b/toolchains/arm-linux-androideabi-clang3.1/setup.mk index 2a47cc2cf..66702886d 100644 --- a/toolchains/arm-linux-androideabi-clang3.1/setup.mk +++ b/toolchains/arm-linux-androideabi-clang3.1/setup.mk @@ -39,8 +39,8 @@ TOOLCHAIN_ROOT := $(NDK_ROOT)/toolchains/$(TOOLCHAIN_NAME) TOOLCHAIN_PREBUILT_ROOT := $(call host-prebuilt-tag,$(TOOLCHAIN_ROOT)) TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREBUILT_ROOT)/bin/arm-linux-androideabi- -TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang -TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++ +TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT) +TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT) # # CFLAGS and LDFLAGS diff --git a/toolchains/mipsel-linux-android-clang3.1/setup.mk b/toolchains/mipsel-linux-android-clang3.1/setup.mk index 56115c561..fb7d39618 100644 --- a/toolchains/mipsel-linux-android-clang3.1/setup.mk +++ b/toolchains/mipsel-linux-android-clang3.1/setup.mk @@ -39,8 +39,8 @@ TOOLCHAIN_ROOT := $(NDK_ROOT)/toolchains/$(TOOLCHAIN_NAME) TOOLCHAIN_PREBUILT_ROOT := $(call host-prebuilt-tag,$(TOOLCHAIN_ROOT)) TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREBUILT_ROOT)/bin/mipsel-linux-android- -TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang -TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++ +TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT) +TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT) # # CFLAGS, C_INCLUDES, and LDFLAGS diff --git a/toolchains/x86-clang3.1/setup.mk b/toolchains/x86-clang3.1/setup.mk index 40e3c08c7..50d0a8c6f 100644 --- a/toolchains/x86-clang3.1/setup.mk +++ b/toolchains/x86-clang3.1/setup.mk @@ -39,8 +39,8 @@ TOOLCHAIN_ROOT := $(NDK_ROOT)/toolchains/$(TOOLCHAIN_NAME) TOOLCHAIN_PREBUILT_ROOT := $(call host-prebuilt-tag,$(TOOLCHAIN_ROOT)) TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREBUILT_ROOT)/bin/i686-linux-android- -TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang -TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++ +TARGET_CC := $(LLVM_TOOLCHAIN_PREFIX)clang$(HOST_EXEEXT) +TARGET_CXX := $(LLVM_TOOLCHAIN_PREFIX)clang++$(HOST_EXEEXT) LLVM_TRIPLE := i686-none-linux-android |