diff options
| author | earthdok <earthdok@chromium.org> | 2015-03-26 08:29:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-26 15:30:04 +0000 |
| commit | aa1496aed055cdb65add7c44a7c7dd0160d875db (patch) | |
| tree | 0b5e1d584c47c159804b1e119721cd656b662ed5 | |
| parent | d99eafdd721def5856d083d00008d9fcd3ea312a (diff) | |
| download | chromium_src-aa1496aed055cdb65add7c44a7c7dd0160d875db.zip chromium_src-aa1496aed055cdb65add7c44a7c7dd0160d875db.tar.gz chromium_src-aa1496aed055cdb65add7c44a7c7dd0160d875db.tar.bz2 | |
Instrumented libraries: allow GOMA with a custom compiler.
BUG=none
R=glider@chromium.org
Review URL: https://codereview.chromium.org/1038883002
Cr-Commit-Position: refs/heads/master@{#322389}
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index ea0c659..4ac7e42 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -6,14 +6,12 @@ 'variables': { 'verbose_libraries_build%': 0, 'instrumented_libraries_jobs%': 1, - 'instrumented_libraries_cc%': '', - 'instrumented_libraries_cxx%': '', + 'instrumented_libraries_cc%': '<!(cd <(DEPTH) && pwd -P)/<(make_clang_dir)/bin/clang', + 'instrumented_libraries_cxx%': '<!(cd <(DEPTH) && pwd -P)/<(make_clang_dir)/bin/clang++', }, 'libdir': 'lib', 'ubuntu_release': '<!(lsb_release -cs)', - 'clang_absolute_path': '<!(cd <(DEPTH) && pwd -P)/<(make_clang_dir)/bin/clang', - 'clang++_absolute_path': '<!(cd <(DEPTH) && pwd -P)/<(make_clang_dir)/bin/clang++', 'conditions': [ ['asan==1', { @@ -26,18 +24,10 @@ 'sanitizer_type': 'tsan', }], ['use_goma==1', { - 'cc': '<(gomadir)/gomacc <(_clang_absolute_path)', - 'cxx': '<(gomadir)/gomacc <(_clang++_absolute_path)', + 'cc': '<(gomadir)/gomacc <(instrumented_libraries_cc)', + 'cxx': '<(gomadir)/gomacc <(instrumented_libraries_cxx)', }, { - 'cc': '<(clang_absolute_path)', - 'cxx': '<(clang++_absolute_path)', - }], - # When building with a custom clang, CC/CXX must be overridden via GYP - # variables. - ['instrumented_libraries_cc!=""', { 'cc': '<(instrumented_libraries_cc)', - }], - ['instrumented_libraries_cxx!=""', { 'cxx': '<(instrumented_libraries_cxx)', }], ], |