diff options
| author | Stephen Hines <srhines@google.com> | 2014-04-25 22:51:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-25 22:51:38 +0000 |
| commit | 46df1818157abd7e8e7288219c3992e1ed451a47 (patch) | |
| tree | d00844a91bf918d8a9abd4cc886434cd879f54f6 /core/clang/TARGET_arm.mk | |
| parent | 8d4562a14da90789f39579e1133a707003b60c0c (diff) | |
| parent | f0dda8d0cbb249be24a71776289b1d9ebe17faaf (diff) | |
| download | build-46df1818157abd7e8e7288219c3992e1ed451a47.zip build-46df1818157abd7e8e7288219c3992e1ed451a47.tar.gz build-46df1818157abd7e8e7288219c3992e1ed451a47.tar.bz2 | |
am f0dda8d0: am 9661b09f: am 9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit 'f0dda8d0cbb249be24a71776289b1d9ebe17faaf':
Build changes necessary for LLVM 3.5 switch.
Diffstat (limited to 'core/clang/TARGET_arm.mk')
| -rw-r--r-- | core/clang/TARGET_arm.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/clang/TARGET_arm.mk b/core/clang/TARGET_arm.mk index f32bbfb..595fb56 100644 --- a/core/clang/TARGET_arm.mk +++ b/core/clang/TARGET_arm.mk @@ -16,12 +16,14 @@ CLANG_CONFIG_arm_TARGET_EXTRA_CFLAGS := \ $(CLANG_CONFIG_EXTRA_CFLAGS) \ $(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \ $(CLANG_CONFIG_arm_EXTRA_CFLAGS) \ + -target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \ $(CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS) CLANG_CONFIG_arm_TARGET_EXTRA_CPPFLAGS := \ $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \ $(CLANG_CONFIG_arm_EXTRA_CPPFLAGS) \ + -target $(CLANG_CONFIG_arm_TARGET_TRIPLE) CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS := \ $(CLANG_CONFIG_EXTRA_LDFLAGS) \ |