Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2170)

Unified Diff: build/common.gypi

Issue 1484883002: clang/arm: Push -no-integrated-as into the four targets that need it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/config/android/BUILD.gn » ('j') | build/config/android/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index c5d5c85ddfc4e95857028dbcdfd1d586c2344574..2cc9762ea011d69b58474e3cd130397c3b82bd98 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -3981,13 +3981,6 @@
}],
],
}],
- ['clang==1 and OS!="android"', {
- 'cflags': [
- # We need to disable clang's builtin assembler as it can't
- # handle several asm files, crbug.com/124610
- '-no-integrated-as',
- ],
- }],
['arm_tune!=""', {
'cflags': [
'-mtune=<(arm_tune)',
@@ -4101,11 +4094,6 @@
'-fno-caller-saves',
'-Wno-psabi',
],
- 'cflags': [
- # TODO(hans) Enable integrated-as (crbug.com/124610).
- '-no-integrated-as',
- '-B<(android_toolchain)', # Else /usr/bin/as gets picked up.
- ],
}],
['clang==1 and linux_use_bundled_gold==0', {
'ldflags': [
@@ -4229,9 +4217,6 @@
],
}],
['clang==1 and OS=="android"', {
- 'cflags': [
- '-B<(android_toolchain)', # Else /usr/bin/as gets picked up.
- ],
'ldflags': [
# Let clang find the ld in the NDK.
'--gcc-toolchain=<(android_toolchain)/..',
« no previous file with comments | « no previous file | build/config/android/BUILD.gn » ('j') | build/config/android/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698