| Index: build/gyp_chromium
|
| diff --git a/build/gyp_chromium b/build/gyp_chromium
|
| index 335df1ccb223cefa68b41e8f95497f97f84506b8..704b5610b30e198df924fa76acb8cfa2acc28b70 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', '')):
|
|
|