tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Switch from clang 3.6 to new clang repository (with 3.8)."

Browse source
This commit is contained in:
Stephen Hines 2015-11-10 05:59:40 +00:00 committed by Gerrit Code Review
commit 106eb619e2
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/clang/config.mk
View file

@ -1,7 +1,6 @@
## Clang configurations.
LLVM_PREBUILTS_VERSION := 3.6
FORCE_BUILD_SANITIZER_SHARED_OBJECTS := true
LLVM_PREBUILTS_VERSION := 3.8
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/

8
core/config_sanitizers.mk
View file

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