Skip to content

Commit 31bc96c

Browse files
Update flang compiler package to 20.1.7 (emscripten-forge#2543)
1 parent 3779f4a commit 31bc96c

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

recipes/recipes/flang_emscripten-wasm32/activate.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
# # Using flang as a WASM cross-compiler
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
6-
micromamba install -p $BUILD_PREFIX \
7-
conda-forge/label/emscripten::flang==$PKG_VERSION \
8-
-y --no-channel-priority
6+
if [ ! -f "$BUILD_PREFIX/bin/flang-new" ]; then
7+
micromamba install -p $BUILD_PREFIX \
8+
conda-forge/label/emscripten::flang==$PKG_VERSION \
9+
llvm20==$PKG_VERSION \
10+
-y --no-channel-priority
11+
fi
912

1013
export FC=flang-new
1114
export F77=flang-new
@@ -16,6 +19,7 @@ export FLANG=flang-new
1619

1720
export FFLAGS="--target=wasm32-unknown-emscripten"
1821
export FPICFLAGS="-fPIC"
22+
export FCLIBS="-lFortranRuntime"
1923

2024
rm $BUILD_PREFIX/bin/clang || true
21-
ln -s $BUILD_PREFIX/bin/clang-20 $BUILD_PREFIX/bin/clang # links to emsdk clang
25+
ln -s $BUILD_PREFIX/bin/clang-20 $BUILD_PREFIX/bin/clang # links to emsdk clang

recipes/recipes/flang_emscripten-wasm32/deactivate.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ unset F18
88
unset FLANG
99
unset FFLAGS
1010
unset FPICFLAGS
11+
unset FCLIBS

recipes/recipes/flang_emscripten-wasm32/recipe.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
context:
22
name: flang_emscripten-wasm32
3-
version: 19.1.7
3+
version: 20.1.7
44

55
package:
66
name: ${{ name }}
77
version: ${{ version }}
88

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

1212
requirements:
1313
build:

0 commit comments

Comments
 (0)