diff options
| author | scottmg <scottmg@chromium.org> | 2015-05-27 12:46:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-27 19:47:07 +0000 |
| commit | 013831e64e2ca1414e86fe2498cb193d5a8b8354 (patch) | |
| tree | 8e2d97804917c43fdadc661c6843a07a222bab10 /build/gyp_chromium | |
| parent | de262b0acc538d307f35b85f4ebf395357d1a4db (diff) | |
| download | chromium_src-013831e64e2ca1414e86fe2498cb193d5a8b8354.zip chromium_src-013831e64e2ca1414e86fe2498cb193d5a8b8354.tar.gz chromium_src-013831e64e2ca1414e86fe2498cb193d5a8b8354.tar.bz2 | |
Roll src/tools/gyp/ to 29e94a3285ee899d14d5e56a6001682620d3778f.
This reinstates the duplicate basename check, on Mac only.
$ git log 0bb67471b..29e94a328 --date=short --format='%ad %ae %s'
2015-05-21 scottmg Avoid lint presubmit error in dump_dependency_json
2015-05-21 scottmg Update shared_library test after c0cf1f22eb
2015-05-21 scottmg Revert "Stop checking for duplicate basenames"
2015-05-14 scottmg Added msvs_application_type_revision for winrt compilation
2015-05-12 torne Remove the Android generator.
R=thakis@chromium.org
BUG=490824, gyp:384, 472772
Review URL: https://codereview.chromium.org/1152323002
Cr-Commit-Position: refs/heads/master@{#331626}
Diffstat (limited to 'build/gyp_chromium')
| -rwxr-xr-x | build/gyp_chromium | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium index 335df1c..704b561 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -261,6 +261,14 @@ if __name__ == '__main__': if gyp_vars_dict.get('OS') != 'ios': args.append('--no-circular-check') + # libtool on Mac warns about duplicate basenames in static libraries, so + # they're disallowed in general by gyp. We are lax on this point, so disable + # this check other than on Mac. GN does not use static libraries as heavily, + # so over time this restriction will mostly go away anyway, even on Mac. + # https://code.google.com/p/gyp/issues/detail?id=384 + if sys.platform != 'darwin': + args.append('--no-duplicate-basename-check') + # We explicitly don't support the make gyp generator (crbug.com/348686). Be # nice and fail here, rather than choking in gyp. if re.search(r'(^|,|\s)make($|,|\s)', os.environ.get('GYP_GENERATORS', '')): |