Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5782d60 authored by Stephen Hines's avatar Stephen Hines Committed by Gerrit Code Review
Browse files

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

parents fc8b3318 1332828b

core/clang/config.mk

+2 −2
Original line number Diff line number Diff line 
## Clang configurations.



LLVM_PREBUILTS_VERSION := 3.6

LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin

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/



CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)

core/config_sanitizers.mk

+5 −3
Original line number Diff line number Diff line
@@ -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

    ifeq ($(filter address,$(my_sanitize)),)

      my_cflags += -fsanitize-trap=all

      my_cflags += -ftrap-function=abort

    endif

    my_shared_libraries += libdl

  endif

endif