Skip to content

Commit f2baa2f

Browse files
authored
Only pass -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON when building llvm. NFC (#1334)
1 parent 96bd9f0 commit f2baa2f

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

emsdk.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -962,13 +962,10 @@ def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_arg
962962
generator = []
963963

964964
cmdline = ['cmake'] + generator + ['-DCMAKE_BUILD_TYPE=' + build_type, '-DPYTHON_EXECUTABLE=' + sys.executable]
965-
# Target macOS 10.14 at minimum, to support widest range of Mac devices from "Early 2008" and newer:
965+
# Target macOS 10.14 at minimum, to support widest range of Mac devices
966+
# from "Early 2008" and newer:
966967
# https://en.wikipedia.org/wiki/MacBook_(2006-2012)#Supported_operating_systems
967968
cmdline += ['-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14']
968-
# To enable widest possible chance of success for building, let the code
969-
# compile through with older toolchains that are about to be deprecated by
970-
# upstream LLVM.
971-
cmdline += ['-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON']
972969
cmdline += extra_cmake_args + [src_root]
973970

974971
print('Running CMake: ' + str(cmdline))
@@ -1106,6 +1103,10 @@ def build_llvm(tool):
11061103
# (there instead of $(Configuration), one would need ${CMAKE_BUILD_TYPE} ?)
11071104
# It looks like compiler-rt is not compatible to build on Windows?
11081105
args += ['-DLLVM_ENABLE_PROJECTS=clang;lld']
1106+
# To enable widest possible chance of success for building, let the code
1107+
# compile through with older toolchains that are about to be deprecated by
1108+
# upstream LLVM.
1109+
args += ['-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON']
11091110

11101111
if os.getenv('LLVM_CMAKE_ARGS'):
11111112
extra_args = os.environ['LLVM_CMAKE_ARGS'].split(',')

0 commit comments

Comments
 (0)