From 668948c89e326240c0bf08a7b3c97b0cb4bd775b Mon Sep 17 00:00:00 2001 From: mcbarton Date: Mon, 3 Feb 2025 21:46:45 +0000 Subject: [PATCH 1/2] Remove unused LLDB_ENABLE_LIBEDIT, LLVM_ENABLE_TERMINFO and PYTHON_EXECUTABLE llvm configure options --- emsdk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emsdk.py b/emsdk.py index 66203b7774..3c55386563 100644 --- a/emsdk.py +++ b/emsdk.py @@ -987,7 +987,7 @@ def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_arg else: generator = [] - cmdline = ['cmake'] + generator + ['-DCMAKE_BUILD_TYPE=' + build_type, '-DPYTHON_EXECUTABLE=' + sys.executable] + cmdline = ['cmake'] + generator + ['-DCMAKE_BUILD_TYPE=' + build_type] # Target macOS 10.14 at minimum, to support widest range of Mac devices # from "Early 2008" and newer: # https://en.wikipedia.org/wiki/MacBook_(2006-2012)#Supported_operating_systems @@ -1120,7 +1120,7 @@ def build_llvm(tool): '-DLLVM_ENABLE_ASSERTIONS=' + ('ON' if enable_assertions else 'OFF'), # Disable optional LLVM dependencies, these can cause unwanted .so dependencies # that prevent distributing the generated compiler for end users. - '-DLLVM_ENABLE_LIBXML2=OFF', '-DLLVM_ENABLE_TERMINFO=OFF', '-DLLDB_ENABLE_LIBEDIT=OFF', + '-DLLVM_ENABLE_LIBXML2=OFF', '-DLLVM_ENABLE_LIBEDIT=OFF', '-DLLVM_ENABLE_LIBPFM=OFF'] # LLVM build system bug: compiler-rt does not build on Windows. It insists on performing a CMake install step that writes to C:\Program Files. Attempting # to reroute that to build_root directory then fails on an error From 171553354d5ffac3cdf3d09d1d554cda1dd679ae Mon Sep 17 00:00:00 2001 From: mcbarton Date: Mon, 3 Feb 2025 21:50:24 +0000 Subject: [PATCH 2/2] Fix flake8 issue with emsdk.py --- emsdk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emsdk.py b/emsdk.py index 3c55386563..8d5263069d 100644 --- a/emsdk.py +++ b/emsdk.py @@ -1120,7 +1120,7 @@ def build_llvm(tool): '-DLLVM_ENABLE_ASSERTIONS=' + ('ON' if enable_assertions else 'OFF'), # Disable optional LLVM dependencies, these can cause unwanted .so dependencies # that prevent distributing the generated compiler for end users. - '-DLLVM_ENABLE_LIBXML2=OFF', + '-DLLVM_ENABLE_LIBXML2=OFF', '-DLLVM_ENABLE_LIBEDIT=OFF', '-DLLVM_ENABLE_LIBPFM=OFF'] # LLVM build system bug: compiler-rt does not build on Windows. It insists on performing a CMake install step that writes to C:\Program Files. Attempting # to reroute that to build_root directory then fails on an error