aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xemcc3
-rw-r--r--tools/shared.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/emcc b/emcc
index 7cc59c53..6f68a355 100755
--- a/emcc
+++ b/emcc
@@ -542,7 +542,8 @@ try:
input_files = []
has_source_inputs = False
- lib_dirs = [shared.path_from_root('system', 'lib')]
+ lib_dirs = [shared.path_from_root('system', 'local', 'lib'),
+ shared.path_from_root('system', 'lib')]
libs = []
for i in range(len(newargs)): # find input files XXX this a simple heuristic. we should really analyze based on a full understanding of gcc params,
# right now we just assume that what is left contains no more |-x OPT| things
diff --git a/tools/shared.py b/tools/shared.py
index 997c0ad9..c923f36b 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -200,6 +200,7 @@ if USE_EMSDK:
# allows projects to override them)
# 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'),
'-Xclang', '-isystem' + path_from_root('system', 'include', 'emscripten'),
'-Xclang', '-isystem' + path_from_root('system', 'include', 'bsd'), # posix stuff