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

Unified Diff: build/config/nacl/rules.gni

Issue 2905523002: Reduce absolute paths in generated ninja files (Closed)
Patch Set: revert build/config/gcc/BUILD.gn, rebase Created 3 years, 7 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 | « no previous file | build/toolchain/gcc_toolchain.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/nacl/rules.gni
diff --git a/build/config/nacl/rules.gni b/build/config/nacl/rules.gni
index c8956b4e6dae241d59ebf7810d4bf9a5ea0ae257..1c1a9121eb935ec7129982af0fed3746f916da03 100644
--- a/build/config/nacl/rules.gni
+++ b/build/config/nacl/rules.gni
@@ -74,14 +74,16 @@ template("generate_nmf") {
# Starts empty so the code below can use += everywhere.
data = []
- nmfflags += [ "--library-path=" + rebase_path(root_out_dir) ]
+ nmfflags +=
+ [ "--library-path=" + rebase_path(root_out_dir, root_build_dir) ]
# NOTE: There is no explicit dependency for the lib directory
# (lib32 and lib64 for x86/x64) created in the product directory.
# They are created as a side-effect of nmf creation.
if (current_cpu != "x86" && current_cpu != "x64") {
nmfflags +=
- [ "--library-path=" + rebase_path("${nacl_toolchain_tooldir}/lib") ]
+ [ "--library-path=" +
+ rebase_path("${nacl_toolchain_tooldir}/lib", root_build_dir) ]
if (current_cpu == "arm") {
data += [ "${lib_path}/libarm/" ]
} else {
@@ -90,8 +92,9 @@ template("generate_nmf") {
} else {
# For x86-32, the lib/ directory is called lib32/ instead.
if (current_cpu == "x86") {
- nmfflags += [ "--library-path=" +
- rebase_path("${nacl_toolchain_tooldir}/lib32") ]
+ nmfflags +=
+ [ "--library-path=" +
+ rebase_path("${nacl_toolchain_tooldir}/lib32", root_build_dir) ]
data += [ "${lib_path}/lib32/" ]
}
@@ -112,8 +115,9 @@ template("generate_nmf") {
"root_out_dir")
}
nmfflags += [
- "--library-path=" + rebase_path(x64_out_dir),
- "--library-path=" + rebase_path("${nacl_toolchain_tooldir}/lib"),
+ "--library-path=" + rebase_path(x64_out_dir, root_build_dir),
+ "--library-path=" +
+ rebase_path("${nacl_toolchain_tooldir}/lib", root_build_dir),
]
data += [ "${lib_path}/lib64/" ]
}
@@ -121,7 +125,7 @@ template("generate_nmf") {
}
args = [
"--no-default-libpath",
- "--objdump=" + objdump,
+ "--objdump=" + rebase_path(objdump, root_build_dir),
"--output=" + rebase_path(nmf, root_build_dir),
] + nmfflags + rebase_path(sources, root_build_dir)
if (is_nacl_glibc && current_cpu == "arm") {
« no previous file with comments | « no previous file | build/toolchain/gcc_toolchain.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698