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

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

Issue 1643523004: Reverts fdca07 and makes it possible to force absolute paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adds missing dependency Created 4 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/linux/pkg_config.gni ('k') | build/config/sysroot.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/posix/BUILD.gn
diff --git a/build/config/posix/BUILD.gn b/build/config/posix/BUILD.gn
index 6f65443d7279bbd6603824aba8b9b345bcb4c73d..b2ccacebfd9767477c883bbe5c5ff2abb3dd8557 100644
--- a/build/config/posix/BUILD.gn
+++ b/build/config/posix/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/build_metadata.gni")
import("//build/config/sysroot.gni")
assert(is_posix)
@@ -13,7 +14,14 @@ assert(is_posix)
config("runtime_library") {
if (!is_mac && sysroot != "") {
# Pass the sysroot to all C compiler variants, the assembler, and linker.
- cflags = [ "--sysroot=" + sysroot ]
+ # If we don't care about build metadata, then just set the sysroot to an
+ # absolute path. Some buildbots (read: codesearch) care about this.
+ # See crbug.com/580103 for some discussion of why this was necessary.
+ if (dont_embed_build_metadata) {
+ cflags = [ "--sysroot=" + rebase_path(sysroot, root_build_dir) ]
+ } else {
+ cflags = [ "--sysroot=" + rebase_path(sysroot) ]
+ }
asmflags = cflags
ldflags = cflags
« no previous file with comments | « build/config/linux/pkg_config.gni ('k') | build/config/sysroot.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698