From d6b1ccbf29e1c31b0ed3c708220aedefd073ab4e Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Thu, 18 Apr 2024 13:30:52 +0200 Subject: [PATCH] added missing CC/CXX/AR/RANLIB flags (#903) * cleanup * keep sync --- recipes/recipes/emscripten_emscripten-wasm32/activate.sh | 9 +++++---- .../emscripten_emscripten-wasm32/rattler_recipe.yaml | 2 +- recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/recipes/recipes/emscripten_emscripten-wasm32/activate.sh b/recipes/recipes/emscripten_emscripten-wasm32/activate.sh index e47df4663..8857c1794 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/activate.sh +++ b/recipes/recipes/emscripten_emscripten-wasm32/activate.sh @@ -32,10 +32,11 @@ if [ -z ${CONDA_FORGE_EMSCRIPTEN_ACTIVATED+x} ]; then export PATH="$CONDA_EMSDK_DIR/upstream/emscripten/":$PATH # clear all prexisting cmake args / CC / CXX / AR / RANLIB - export CC="" - export CXX="" - export AR="" - export RANLIB="" + export CC="emcc" + export CXX="em++" + export AR="emar" + export RANLIB="emranlib" + export CMAKE_ARGS="" diff --git a/recipes/recipes/emscripten_emscripten-wasm32/rattler_recipe.yaml b/recipes/recipes/emscripten_emscripten-wasm32/rattler_recipe.yaml index afe84e5cb..2d4c73e6d 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/rattler_recipe.yaml +++ b/recipes/recipes/emscripten_emscripten-wasm32/rattler_recipe.yaml @@ -3,7 +3,7 @@ context: version: 3.1.45 build: - number: 22 + number: 23 outputs: # TODO make run_exports work with boa diff --git a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml index aee736b82..9458f52f3 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml @@ -8,7 +8,7 @@ package: build: - number: 22 + number: 23 outputs: