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

Unified Diff: build/config/compiler/BUILD.gn

Issue 138273007: Convert GN single-item list concat to use lists. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 6 years, 11 months 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 | « build/config/clang/BUILD.gn ('k') | build/config/win/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 25b0759ca969feaa880e0c74a5062023d3a9d9da..8a8ba2e00e4d60ab5d54acf0d7d78bee1c9225cb 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -53,7 +53,7 @@ config("compiler") {
# Stack protection.
if (is_mac) {
- cflags += "-fstack-protector-all"
+ cflags += [ "-fstack-protector-all" ]
} else if (is_linux) {
cflags += [ "-fstack-protector", "--param=ssp-buffer-size=4" ]
}
@@ -70,9 +70,9 @@ config("compiler") {
# CPU architecture.
if (cpu_arch == "x64") {
- common_mac_flags += "-arch x86_64"
+ common_mac_flags += [ "-arch x86_64" ]
} else if (cpu_arch == "x86") {
- common_mac_flags += "-arch i386"
+ common_mac_flags += [ "-arch i386" ]
}
cflags += common_mac_flags + [
@@ -98,11 +98,11 @@ config("compiler") {
# CPU architecture. We may or may not be doing a cross compile now, so for
# simplicity we always explicitly set the architecture.
if (cpu_arch == "x64") {
- cflags += "-m64"
- ldflags += "-m64"
+ cflags += [ "-m64" ]
+ ldflags += [ "-m64" ]
} else if (cpu_arch == "x86") {
- cflags += "-m32"
- ldflags += "-m32"
+ cflags += [ "-m32" ]
+ ldflags += [ "-m32" ]
} else if (cpu_arch == "arm") {
# Don't set the compiler flags for the WebView build. These will come
# from the Android build system.
@@ -113,7 +113,7 @@ config("compiler") {
"-mfloat-abi=$arm_float_abi",
]
if (arm_tune != "") {
- cflags += "-mtune=$arm_tune"
+ cflags += [ "-mtune=$arm_tune" ]
}
if (arm_use_thumb) {
cflags += [ "-mthumb" ]
@@ -174,14 +174,14 @@ config("compiler") {
}
if (sysroot != "") {
- cflags += "--sysroot=" + sysroot
- ldflags += "--sysroot=" + sysroot
+ cflags += [ "--sysroot=" + sysroot ]
+ ldflags += [ "--sysroot=" + sysroot ]
# Need to get some linker flags out of the sysroot.
- ldflags += exec_script("../linux/sysroot_ld_path.py",
+ ldflags += [ exec_script("../linux/sysroot_ld_path.py",
[rebase_path("../../linux/sysroot_ld_path.sh", ".", root_build_dir),
sysroot],
- "value")
+ "value") ]
}
ldflags += [
« no previous file with comments | « build/config/clang/BUILD.gn ('k') | build/config/win/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698