admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around OS X Xcode(?) build bug by adding -stdlib=libc++ to CXXFLAGS when building.

Browse Source
This commit is contained in:
Jukka Jylänki
2015-06-18 13:31:34 +03:00
parent b03859dcdb
commit bc56d6eee0
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
emsdk
View File

@@ -457,6 +457,15 @@ def fastcomp_build_bin_dir(tool):
make_env = os.environ.copy() make_env = os.environ.copy()
cxxflags = ''
if hasattr(make_env, 'CXXFLAGS'): cxxflags = make_env['CXXFLAGS'] + ' '
# To work around a build issue with older Mac OS X builds, add -stdlib=libc++ to all builds.
# See https://groups.google.com/forum/#!topic/emscripten-discuss/5Or6QIzkqf0
if OSX: cxxflags += '-stdlib=libc++'
make_env['CXXFLAGS'] = cxxflags
def find_msbuild(sln_file): def find_msbuild(sln_file):
search_paths_vs2013 = [os.path.join(os.environ['ProgramFiles'], 'MSBuild/12.0/Bin/amd64'), search_paths_vs2013 = [os.path.join(os.environ['ProgramFiles'], 'MSBuild/12.0/Bin/amd64'),
os.path.join(os.environ['ProgramFiles(x86)'], 'MSBuild/12.0/Bin/amd64'), os.path.join(os.environ['ProgramFiles(x86)'], 'MSBuild/12.0/Bin/amd64'),