Index: build/config/posix/BUILD.gn |
diff --git a/build/config/posix/BUILD.gn b/build/config/posix/BUILD.gn |
index b2ccacebfd9767477c883bbe5c5ff2abb3dd8557..1abbcebba4aefb62cd6e06644354821551621666 100644 |
--- a/build/config/posix/BUILD.gn |
+++ b/build/config/posix/BUILD.gn |
@@ -2,7 +2,6 @@ |
# 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) |
@@ -14,14 +13,7 @@ assert(is_posix) |
config("runtime_library") { |
if (!is_mac && sysroot != "") { |
# Pass the sysroot to all C compiler variants, the assembler, and linker. |
- # 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) ] |
- } |
+ cflags = [ "--sysroot=" + rebase_path(sysroot, root_build_dir) ] |
Nico
2016/02/10 13:43:45
fwiw i'd land this change first, in a separate cl,
|
asmflags = cflags |
ldflags = cflags |