diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 05:17:26 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 05:17:26 +0000 |
| commit | 516312d2e906c66b3f5b18711130387642dfd7c7 (patch) | |
| tree | b7c8b8d6ecba288e4d9682a47d5947f2d913c139 /build | |
| parent | 6a552c8964d0a25dcc8bc798661029e8fe6074d3 (diff) | |
| download | chromium_src-516312d2e906c66b3f5b18711130387642dfd7c7.zip chromium_src-516312d2e906c66b3f5b18711130387642dfd7c7.tar.gz chromium_src-516312d2e906c66b3f5b18711130387642dfd7c7.tar.bz2 | |
Fix linking when in a WebKit only checkout.
third_party is in a different location relative to the output directory
in WebKit only checkouts.
Review URL: http://codereview.chromium.org/9476013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/build/common.gypi b/build/common.gypi index cede6f1..e1081dc 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2020,11 +2020,17 @@ }], ['linux_use_gold_binary==1', { 'variables': { - # We pass the path to gold to the compiler. gyp leaves - # unspecified what the cwd is when running the compiler, - # so the normal gyp path-munging fails us. This hack - # gets the right path. - 'gold_path': '<(PRODUCT_DIR)/../../third_party/gold', + 'conditions': [ + ['inside_chromium_build==1', { + # We pass the path to gold to the compiler. gyp leaves + # unspecified what the cwd is when running the compiler, + # so the normal gyp path-munging fails us. This hack + # gets the right path. + 'gold_path': '<(PRODUCT_DIR)/../../third_party/gold', + }, { + 'gold_path': '<(PRODUCT_DIR)/../../Source/WebKit/chromium/third_party/gold', + }] + ] }, 'ldflags': [ # Put our gold binary in the search path for the linker. |