From b45fe5a2abd3561e681387e52541294602033217 Mon Sep 17 00:00:00 2001 From: Ian Thomas Date: Wed, 30 Sep 2026 11:27:25 +0100 Subject: [PATCH 1/2] Add /lib to rpath in emscripten-6x --- recipes/recipes_native/emscripten-core/activate.sh | 2 +- recipes/recipes_native/emscripten-core/recipe.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes_native/emscripten-core/activate.sh b/recipes/recipes_native/emscripten-core/activate.sh index e9c8fa3a42c..26b5c381f51 100644 --- a/recipes/recipes_native/emscripten-core/activate.sh +++ b/recipes/recipes_native/emscripten-core/activate.sh @@ -60,7 +60,7 @@ if [ -z ${CONDA_FORGE_EMSCRIPTEN_ACTIVATED+x} ]; then export SIMD_FLAGS="-msimd128" # basics ld - export EM_FORGE_LDFLAGS_BASE="-L${PREFIX}/lib" + export EM_FORGE_LDFLAGS_BASE="-L${PREFIX}/lib -Wl,-rpath,/lib" export EM_FORGE_LDFLAGS_BASE="${EM_FORGE_OPTFLAGS} ${EM_FORGE_DBGFLAGS} ${EM_FORGE_LDFLAGS_BASE}" # basics cflags diff --git a/recipes/recipes_native/emscripten-core/recipe.yaml b/recipes/recipes_native/emscripten-core/recipe.yaml index c7a7bac9edb..e43469a19b8 100644 --- a/recipes/recipes_native/emscripten-core/recipe.yaml +++ b/recipes/recipes_native/emscripten-core/recipe.yaml @@ -4,7 +4,7 @@ context: abi_version: 6.0.8 build: - number: 2 + number: 3 outputs: - package: From 3e7384ca44a4cbf5655c0ea725b4dbf94400e21d Mon Sep 17 00:00:00 2001 From: Ian Thomas Date: Wed, 30 Sep 2026 12:19:34 +0100 Subject: [PATCH 2/2] Use LDFLAGS instead of EM_FORGE_LDFLAGS_BASE --- recipes/recipes_native/emscripten-core/activate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes_native/emscripten-core/activate.sh b/recipes/recipes_native/emscripten-core/activate.sh index 26b5c381f51..378c7380604 100644 --- a/recipes/recipes_native/emscripten-core/activate.sh +++ b/recipes/recipes_native/emscripten-core/activate.sh @@ -60,8 +60,8 @@ if [ -z ${CONDA_FORGE_EMSCRIPTEN_ACTIVATED+x} ]; then export SIMD_FLAGS="-msimd128" # basics ld - export EM_FORGE_LDFLAGS_BASE="-L${PREFIX}/lib -Wl,-rpath,/lib" - export EM_FORGE_LDFLAGS_BASE="${EM_FORGE_OPTFLAGS} ${EM_FORGE_DBGFLAGS} ${EM_FORGE_LDFLAGS_BASE}" + export LDFLAGS="-L$PREFIX/lib -Wl,-rpath,/lib" + export EM_FORGE_LDFLAGS_BASE="${EM_FORGE_OPTFLAGS} ${EM_FORGE_DBGFLAGS}" # basics cflags export EM_FORGE_CFLAGS_BASE="-fPIC"