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

Unified Diff: build/toolchain/linux/BUILD.gn

Issue 1352313002: GN: Harmonize ARM compiler settings with GYP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« build/config/sysroot.gni ('K') | « build/config/sysroot.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/linux/BUILD.gn
diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
index 94d9a16a23e6465240c645b058281418ce8bc7a2..84a790df87f56bea99301e857fd062cf472e6faf 100644
--- a/build/toolchain/linux/BUILD.gn
+++ b/build/toolchain/linux/BUILD.gn
@@ -16,14 +16,34 @@ if (use_goma) {
compiler_prefix = ""
}
+gcc_toolchain("clang_arm") {
+ prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
+ root_build_dir)
+ cc = "${compiler_prefix}$prefix/clang"
+ cxx = "${compiler_prefix}$prefix/clang++"
+
+ toolprefix = "arm-linux-gnueabihf-"
+ readelf = "${toolprefix}readelf"
+ ar = "${toolprefix}ar"
+ ld = cxx
+ readelf = "${toolprefix}readelf"
+ nm = "${toolprefix}nm"
+
+ toolchain_cpu = "arm"
+ toolchain_os = "linux"
+ is_clang = true
+}
+
gcc_toolchain("arm") {
- cc = "${compiler_prefix}arm-linux-gnueabi-gcc"
- cxx = "${compiler_prefix}arm-linux-gnueabi-g++"
+ toolprefix = "arm-linux-gnueabihf-"
+
+ cc = "${compiler_prefix}${toolprefix}gcc"
+ cxx = "${compiler_prefix}${toolprefix}g++"
- ar = "arm-linux-gnueabi-ar"
+ ar = "${toolprefix}ar"
ld = cxx
- readelf = "arm-linux-gnueabi-readelf"
- nm = "arm-linux-gnueabi-nm"
+ readelf = "${toolprefix}readelf"
+ nm = "${toolprefix}nm"
toolchain_cpu = "arm"
toolchain_os = "linux"
« build/config/sysroot.gni ('K') | « build/config/sysroot.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698