Skip to content

Commit ed8cbff

Browse files
committed
nix/build-all propagate BUILD_SHARED_LIBS for -shared build
1 parent c6bce34 commit ed8cbff

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

nix/build-all.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ def v(dep):
214214
else:
215215
logger.setLevel(logging.INFO)
216216

217+
OFF_ON = ["OFF", "ON"]
217218
BUILD_STATIC = "shared" not in flags
218219
ENABLE_FLAG = "--enable-static" if BUILD_STATIC else "--enable-shared"
219220
DISABLE_FLAG = "--disable-shared" if BUILD_STATIC else "--disable-static"
@@ -325,7 +326,7 @@ def run_cmake(arg1, cmake_args, cmake_dir=None, cwd=None):
325326
if "wasm" in flags:
326327
wasm.append("emcmake")
327328

328-
run([*wasm, "cmake", P, *cmake_args, f"-DCMAKE_BUILD_TYPE={BUILD_CFG}"], cwd=cwd)
329+
run([*wasm, "cmake", P, *cmake_args, f"-DCMAKE_BUILD_TYPE={BUILD_CFG}", f"-DBUILD_SHARED_LIBS={OFF_ON[not BUILD_STATIC]}"], cwd=cwd)
329330

330331

331332
def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
@@ -759,7 +760,6 @@ def build_dependency(name, mode, build_tool_args, download_url, download_name, d
759760
executables_dir = os.path.join(IFCOS_DIR, "executables")
760761
os.makedirs(executables_dir, exist_ok=True)
761762

762-
OFF_ON = ["OFF", "ON"]
763763

764764
cmake_args = [
765765
"-DUSE_MMAP=" "OFF",

0 commit comments

Comments
 (0)