diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 08:57:26 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-23 08:57:26 +0000 |
| commit | e3b9d0be7fcc1ed82c55d8a3bc4a6105c1d3ea9f (patch) | |
| tree | c0db34b4baa7a3fef3746697d221b0f26e6c38a5 /build | |
| parent | 720b10490523188c34b012d1ccf2059020cc13e1 (diff) | |
| download | chromium_src-e3b9d0be7fcc1ed82c55d8a3bc4a6105c1d3ea9f.zip chromium_src-e3b9d0be7fcc1ed82c55d8a3bc4a6105c1d3ea9f.tar.gz chromium_src-e3b9d0be7fcc1ed82c55d8a3bc4a6105c1d3ea9f.tar.bz2 | |
GN: Fix extra escaping of rpath=$ORIGIN/lib ldflag
As written the argument ended up in the .ninja file as \\\$$ORIGIN/lib/
but we want \$$ORIGIN/lib/ to match gyp.
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/409883009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/config/gcc/BUILD.gn | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn index d5b9ddb..c9639ad 100644 --- a/build/config/gcc/BUILD.gn +++ b/build/config/gcc/BUILD.gn @@ -21,9 +21,8 @@ config("symbol_visibility_hidden") { # Settings for executables and shared libraries. config("executable_ldconfig") { ldflags = [ - # Want to pass "\$". Need to escape both '\' and '$'. GN will re-escape as - # required for ninja. - "-Wl,-rpath=\\\$ORIGIN/lib/", + # Want to pass "\$". GN will re-escape as required for ninja. + "-Wl,-rpath=\$ORIGIN/lib/", "-Wl,-rpath-link=lib/", ] |