diff options
| author | Nowar Gu <nowar100@gmail.com> | 2011-07-04 14:26:09 +0800 |
|---|---|---|
| committer | Nowar Gu <nowar100@gmail.com> | 2011-07-04 14:27:09 +0800 |
| commit | e929a698abf4470542eb418740f537869447f1bd (patch) | |
| tree | 0d2871f629c73bf440d4d012b5f3ab17a97c0421 | |
| parent | e2cecd247645988a88ce02094b986f8498fb0cc2 (diff) | |
| download | gdk-e929a698abf4470542eb418740f537869447f1bd.tar.gz | |
Fix cmd-build-bitcode defined commands.
I found that this architecture is not good.
For example, jni/Application.mk cannot use ARM and LLVM at the
same time. This bug is because of the rules in build/core/.
I will do a big refactoring on <GDK>/build/core and de-coupling
this from <NDK>/build/core these days.
| -rw-r--r-- | toolchains/llvm/setup.mk | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/toolchains/llvm/setup.mk b/toolchains/llvm/setup.mk index 7b3b481..99bcd4e 100644 --- a/toolchains/llvm/setup.mk +++ b/toolchains/llvm/setup.mk @@ -1,33 +1,33 @@ TOOLCHAIN_PREFIX := $(TOOLCHAIN_PREFIX:%-=%) -TARGET_CC := $(TOOLCHAIN_PREFIX)llvm-ndk-cc -TARGET_CFLAGS := - -TARGET_CXX := $(TOOLCHAIN_PREFIX)llvm-ndk-cc -TARGET_CXXFLAGS := $(TARGET_CFLAGS) -fno-exceptions -fno-rtti -D __cplusplus - -TARGET_LD := $(TOOLCHAIN_PREFIX)llvm-ndk-link -TARGET_LDFLAGS := - -TARGET_AR := ar -TARGET_ARFLAGS := crs - -TARGET_C_INCLUDES := \ - $(SYSROOT)/usr/include +#TARGET_CC := $(TOOLCHAIN_PREFIX)llvm-ndk-cc +#TARGET_CFLAGS := +# +#TARGET_CXX := $(TOOLCHAIN_PREFIX)llvm-ndk-cc +#TARGET_CXXFLAGS := $(TARGET_CFLAGS) -fno-exceptions -fno-rtti -D __cplusplus +# +#TARGET_LD := $(TOOLCHAIN_PREFIX)llvm-ndk-link +#TARGET_LDFLAGS := +# +#TARGET_AR := ar +#TARGET_ARFLAGS := crs +# +#TARGET_C_INCLUDES := \ +# $(SYSROOT)/usr/include # # Break build/core/default-build-commands.mk rules # -TARGET_NO_UNDEFINED_LDFLAGS := -TARGET_NO_EXECUTE_CFLAGS := -TARGET_NO_EXECUTE_LDFLAGS := -TARGET_LDLIBS := -cmd-strip := +#TARGET_NO_UNDEFINED_LDFLAGS := +#TARGET_NO_EXECUTE_CFLAGS := +#TARGET_NO_EXECUTE_LDFLAGS := +#TARGET_LDLIBS := +#cmd-strip := define cmd-build-bitcode -$(TARGET_LD) \ - $(call host-path, $(PRIVATE_OBJECTS)) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_LDLIBS) \ - -o $(call host-path, $@) +$(BITCODE_LD) \ + $(call host-path, $(PRIVATE_OBJECTS)) \ + $(PRIVATE_LDFLAGS) \ + $(PRIVATE_LDLIBS) \ + -o $(call host-path, $@) endef |