diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-03-06 10:07:37 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-03-06 10:07:37 -0800 |
| commit | 4d3410d10ee4007ee9f1d15e9828999c3d4ad9d9 (patch) | |
| tree | 4f9e84e94b7bfc8b329efac086e5e1b402946d38 /tools | |
| parent | 273f7a00cf2a1f25a58a43ace174b815e17c5c45 (diff) | |
| parent | a58194543c23f55c1206fb809dbf6447d01da163 (diff) | |
Merge pull request #920 from waywardmonkeys/fix-include-order
Search libcxx includes before others (libc).
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/shared.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/shared.py b/tools/shared.py index 1d1bebdd..6434fb06 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -388,11 +388,11 @@ if USE_EMSDK: # Note that -nostdinc++ is not needed, since -nostdinc implies that! EMSDK_OPTS = ['-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'), '-Xclang', '-isystem' + path_from_root('system', 'include', 'emscripten'), '-Xclang', '-isystem' + path_from_root('system', 'include', 'bsd'), # posix stuff '-Xclang', '-isystem' + path_from_root('system', 'include', 'libc'), - '-Xclang', '-isystem' + path_from_root('system', 'include', 'libcxx'), '-Xclang', '-isystem' + path_from_root('system', 'lib', 'libcxxabi', 'include'), '-Xclang', '-isystem' + path_from_root('system', 'include', 'gfx'), '-Xclang', '-isystem' + path_from_root('system', 'include', 'net'), |