summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorcjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-13 19:32:48 +0000
committercjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-13 19:32:48 +0000
commitac15ff0c6ba70ca1748608da54d50f36a6a5c19c (patch)
tree6aa92afe6c15574c1c1961caae1d42ff72fcb0c0 /build
parent86d590c8832436e1ff043177bd148b49fa405854 (diff)
downloadchromium_src-ac15ff0c6ba70ca1748608da54d50f36a6a5c19c.zip
chromium_src-ac15ff0c6ba70ca1748608da54d50f36a6a5c19c.tar.gz
chromium_src-ac15ff0c6ba70ca1748608da54d50f36a6a5c19c.tar.bz2
Pass the gold binary directory to the linker with an absolute path
The previous way "<(PRODUCT_DIR)/../../" doesn't work very well with some non-default output directories. (This was fixed for linux in https://codereview.chromium.org/83673002) Review URL: https://codereview.chromium.org/276993003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 6d076bb..4000efe 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -3534,7 +3534,7 @@
'ldflags': [
# As long as -fuse-ld=gold doesn't work, add a dummy directory
# with an 'ld' that redirects to gold, so that clang uses gold.
- '-B<(PRODUCT_DIR)/../../build/android/arm-linux-androideabi-gold',
+ '-B<!(cd <(DEPTH) && pwd -P)/build/android/arm-linux-androideabi-gold',
],
}],
['asan==1', {