diff options
| author | raphael.kubo.da.costa@intel.com <raphael.kubo.da.costa@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 20:46:53 +0000 |
|---|---|---|
| committer | raphael.kubo.da.costa@intel.com <raphael.kubo.da.costa@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 20:46:53 +0000 |
| commit | c0dada1d2b570d139079cf3c43cdd38dd6e48898 (patch) | |
| tree | e2f5b350071ab305c9f6193bd9bd72eb69fcc4a3 | |
| parent | 7c766e9434441f945508f2bbdbe416fd557b7d02 (diff) | |
| download | chromium_src-c0dada1d2b570d139079cf3c43cdd38dd6e48898.zip chromium_src-c0dada1d2b570d139079cf3c43cdd38dd6e48898.tar.gz chromium_src-c0dada1d2b570d139079cf3c43cdd38dd6e48898.tar.bz2 | |
Pass the gold binary to the linker using only absolute paths.
The previous expansion using <(PRODUCT_DIR)/../.. did not work correctly
if one was using a different build directory layout (out-of-source
builds, or some build directory with a different number of
subdirectories).
Solve this by doing the same as the sysroot variables: stop using
relative paths from the build directory and extract absolute paths using
DEPTH.
TEST=./build/gyp_chromium -Goutput_dir=/somewhere/else
R=phajdan.jr@chromium.org,thakis@chromium.org,dpranke@chromium.org
Review URL: https://codereview.chromium.org/83673002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236822 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 05f0f24..c984a48 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3552,7 +3552,7 @@ # unspecified what the cwd is when running the compiler, # so the normal gyp path-munging fails us. This hack # gets the right path. - '-B<(PRODUCT_DIR)/../../third_party/gold', + '-B<!(cd <(DEPTH) && pwd -P)/third_party/gold', ], }], ], |