Remove workaround for building old/unsupported macOS version. NFC (#1745)
This workaround was created in 2015 for macOS 10.10.2:
https://groups.google.com/g/emscripten-discuss/c/5Or6QIzkqf0.
These days we require at least macOS 11.0 (See README.md).
Also, limit the windows hack to only the MSBuild is actually used.
diff --git a/emsdk.py b/emsdk.py
index 930792f..b6e86f0 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -891,18 +891,16 @@
def build_env():
- env = os.environ.copy()
-
- # 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 MACOS:
- env['CXXFLAGS'] = ((env['CXXFLAGS'] + ' ') if hasattr(env, 'CXXFLAGS') else '') + '-stdlib=libc++'
- if WINDOWS:
+ if WINDOWS and 'Visual Studio' in CMAKE_GENERATOR:
+ env = os.environ.copy()
# MSBuild.exe has an internal mechanism to avoid N^2 oversubscription of threads in its two-tier build model, see
# https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
env['UseMultiToolTask'] = 'true'
env['EnforceProcessCountAcrossBuilds'] = 'true'
- return env
+ return env
+
+ # By default, just inherit the parent env
+ return None
def find_cmake():