Skip to content

Commit 61afd1d

Browse files
committed
Update flang package
1 parent ae433ea commit 61afd1d

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

recipes/recipes/flang_emscripten-wasm32/activate-flang_emscripten-wasm32.sh renamed to recipes/recipes/flang_emscripten-wasm32/activate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# # https://github.com/serge-sans-paille/llvm-project/blob/feature/flang-wasm/README.wasm.md
55
# # https://github.com/conda-forge/flang-feedstock/pull/69
66
micromamba install -p $BUILD_PREFIX \
7-
conda-forge/label/emscripten::flang==19.1.7 \
7+
conda-forge/label/emscripten::flang==$PKG_VERSION \
88
-y --no-channel-priority
99

1010
export FC=flang-new

recipes/recipes/flang_emscripten-wasm32/build.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ set -ex
77
# See: https://github.com/emscripten-forge/recipes/pull/2046
88
cp $RECIPE_DIR/libFortranRuntime_emscripten-wasm32.a $PREFIX/lib/
99

10-
mkdir -p $PREFIX/etc/conda/activate.d
11-
mkdir -p $PREFIX/etc/conda/deactivate.d
12-
13-
cp $RECIPE_DIR/activate-flang_emscripten-wasm32.sh $PREFIX/etc/conda/activate.d/
14-
cp $RECIPE_DIR/deactivate-flang_emscripten-wasm32.sh $PREFIX/etc/conda/deactivate.d/
10+
# Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
11+
# This will allow them to be run on environment activation.
12+
for TASK in "activate" "deactivate"
13+
do
14+
mkdir -p "${PREFIX}/etc/conda/${TASK}.d"
15+
envsubst '$PKG_VERSION' < "${RECIPE_DIR}/${TASK}.sh" > "${PREFIX}/etc/conda/${TASK}.d/${TASK}_${PKG_NAME}.sh"
16+
done

recipes/recipes/flang_emscripten-wasm32/deactivate-flang_emscripten-wasm32.sh renamed to recipes/recipes/flang_emscripten-wasm32/deactivate.sh

File renamed without changes.

recipes/recipes/flang_emscripten-wasm32/recipe.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package:
77
version: ${{ version }}
88

99
build:
10-
number: 1
10+
number: 2
1111

1212
requirements:
1313
build:

0 commit comments

Comments
 (0)