Skip to content

build: include system ICU headers with -isystem #66928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
khemssharma wants to merge 1 commit into from
Closed

build: include system ICU headers with -isystem #66928

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2619,7 +2619,18 @@ def icu_download(path):
o['libraries'] += libs.split()
if cflags:
stripped_flags = [flag.strip() for flag in cflags.split('-I')]
o['include_dirs'] += [flag for flag in stripped_flags if flag]
# Pass system ICU headers via -isystem rather than -I so that warnings
# originating from them (e.g. clang's -Wunnecessary-virtual-specifier
# in unicode/uniset.h) are not turned into errors by --error-on-warn.
isystem_flags = []
for flag in stripped_flags:
if flag:
isystem_flags += ['-isystem', flag]
o['cflags'] += isystem_flags
o.setdefault('xcode_settings', {}).setdefault('OTHER_CFLAGS', [])
o['xcode_settings']['OTHER_CFLAGS'] += isystem_flags
if flavor == 'win':
o['include_dirs'] += [flag for flag in stripped_flags if flag]
# use the "system" .gyp
o['variables']['icu_gyp_path'] = 'tools/icu/icu-system.gyp'
return
Expand Down