openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8)."" am: a7918b4948 

am: adb12a039a

* commit 'adb12a039ab34f1b9a33f933a249b0c86e389737':
  Revert "Switch from clang 3.6 to new clang repository (with 3.8)."
This commit is contained in:
Stephen Hines 2015-10-21 16:46:29 +00:00 committed by android-build-merger
parent 44fd42d6af adb12a039a
commit 4647caa921
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/clang/config.mk
View File

@ -1,6 +1,7 @@
## Clang configurations. ## Clang configurations.
LLVM_PREBUILTS_VERSION := 3.8 LLVM_PREBUILTS_VERSION := 3.6
FORCE_BUILD_SANITIZER_SHARED_OBJECTS := true
LLVM_PREBUILTS_PATH := prebuilts/clang/host/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin LLVM_PREBUILTS_PATH := prebuilts/clang/host/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin
LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/ LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/

8
core/config_sanitizers.mk
View File

@ -84,7 +84,7 @@ ifneq ($(filter coverage,$(my_sanitize)),)
endif endif
ifneq ($(my_sanitize),) ifneq ($(my_sanitize),)
fsanitize_arg := $(subst $(space),$(comma),$(my_sanitize)) fsanitize_arg := $(subst $(space),$(comma),$(my_sanitize)),
my_cflags += -fsanitize=$(fsanitize_arg) my_cflags += -fsanitize=$(fsanitize_arg)
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
@ -92,10 +92,8 @@ ifneq ($(my_sanitize),)
my_ldflags += -fsanitize=$(fsanitize_arg) my_ldflags += -fsanitize=$(fsanitize_arg)
my_ldlibs += -lrt -ldl my_ldlibs += -lrt -ldl
else else
ifeq ($(filter address,$(my_sanitize)),) my_cflags += -fsanitize-undefined-trap-on-error
my_cflags += -fsanitize-trap=all my_cflags += -ftrap-function=abort
my_cflags += -ftrap-function=abort
endif
my_shared_libraries += libdl my_shared_libraries += libdl
endif endif
endif endif