diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-03-30 15:46:45 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-03-30 15:46:45 -0700 |
| commit | c99afc04fe74867e18734431a2468168073b09f9 (patch) | |
| tree | f8eb19d244e36b04e56792677efcb34e6c692546 /tools | |
| parent | 9da23d106c4d720cbe491aabf1d557e1bf6f2ce2 (diff) | |
| parent | 640c813789b81b30c99220a08c1ca36b8f288f7c (diff) | |
Merge pull request #1004 from waywardmonkeys/fix-nostdincxx
-nostdinc++ is needed to not pick up system C++ headers.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/shared.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/shared.py b/tools/shared.py index d72d2258..6a0ca026 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -384,8 +384,7 @@ USE_EMSDK = not os.environ.get('EMMAKEN_NO_SDK') if USE_EMSDK: # Disable system C and C++ include directories, and add our own (using -idirafter so they are last, like system dirs, which # allows projects to override them) - # Note that -nostdinc++ is not needed, since -nostdinc implies that! - EMSDK_OPTS = ['-nostdinc', '-Xclang', '-nobuiltininc', '-Xclang', '-nostdsysteminc', + EMSDK_OPTS = ['-nostdinc', '-Xclang', '-nostdinc++', '-Xclang', '-nobuiltininc', '-Xclang', '-nostdsysteminc', '-Xclang', '-isystem' + path_from_root('system', 'local', 'include'), '-Xclang', '-isystem' + path_from_root('system', 'include', 'libcxx'), '-Xclang', '-isystem' + path_from_root('system', 'include'), |