StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ea4f39e8: Merge "Switch to Clang 3.6."

Browse Source 
* commit 'ea4f39e86d315793390fb84b5b4d667aa4d3917b':
  Switch to Clang 3.6.
This commit is contained in:
Stephen Hines
2014-12-04 19:51:36 +00:00
committed by Android Git Automerger
parent eae211ba7b ea4f39e86d
commit 3ab4ba1dff
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/clang/config.mk
View File

@@ -6,7 +6,7 @@ WITHOUT_TARGET_CLANG := true
WITHOUT_HOST_CLANG := true WITHOUT_HOST_CLANG := true
endif endif
LLVM_PREBUILTS_VERSION := 3.5 LLVM_PREBUILTS_VERSION := 3.6
LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin
CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX) CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)
@@ -32,7 +32,7 @@ endif
# Clang flags for all host or target rules # Clang flags for all host or target rules
CLANG_CONFIG_EXTRA_ASFLAGS := CLANG_CONFIG_EXTRA_ASFLAGS :=
CLANG_CONFIG_EXTRA_CFLAGS := CLANG_CONFIG_EXTRA_CFLAGS :=
CLANG_CONFIG_EXTRA_CONLYFLAGS := CLANG_CONFIG_EXTRA_CONLYFLAGS := -std=gnu99
CLANG_CONFIG_EXTRA_CPPFLAGS := CLANG_CONFIG_EXTRA_CPPFLAGS :=
CLANG_CONFIG_EXTRA_LDFLAGS := CLANG_CONFIG_EXTRA_LDFLAGS :=
@@ -48,7 +48,13 @@ CLANG_CONFIG_EXTRA_CFLAGS += \
CLANG_CONFIG_EXTRA_CFLAGS += \ CLANG_CONFIG_EXTRA_CFLAGS += \
-Wno-unused-command-line-argument -Wno-unused-command-line-argument
# Disable -Winconsistent-missing-override until we can clean up the existing
# codebase for it.
CLANG_CONFIG_EXTRA_CPPFLAGS += \
-Wno-inconsistent-missing-override
CLANG_CONFIG_UNKNOWN_CFLAGS := \ CLANG_CONFIG_UNKNOWN_CFLAGS := \
-finline-functions \
-finline-limit=64 \ -finline-limit=64 \
-fno-canonical-system-headers \ -fno-canonical-system-headers \
-fno-tree-sra \ -fno-tree-sra \