Skip to content

Commit 8e75f7d

Browse files
authored
Merge pull request #1353 from xoviat/patch-1
[appveyor] use flang from conda-forge
2 parents bd35467 + 307305a commit 8e75f7d

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

appveyor.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,12 @@ environment:
3737
install:
3838
- if [%COMPILER%]==[clang-cl] call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
3939
- if [%COMPILER%]==[clang-cl] conda config --add channels conda-forge --force
40+
- if [%COMPILER%]==[clang-cl] conda install --yes --quiet clangdev
41+
42+
- if [%WITH_FORTRAN%]==[yes] conda install --yes --quiet flang
4043
- if [%WITH_FORTRAN%]==[yes] conda config --add channels isuruf/label/flang --force
41-
- if [%COMPILER%]==[clang-cl] conda install --yes --quiet clangdev ninja cmake
42-
- if [%WITH_FORTRAN%]==[yes] conda install --yes --quiet flangdev clangdev cmake
44+
45+
- if [%COMPILER%]==[clang-cl] conda install --yes --quiet ninja cmake
4346
- if [%COMPILER%]==[clang-cl] call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
4447
- if [%COMPILER%]==[clang-cl] set "LIB=%CONDA_INSTALL_LOCN%\Library\lib;%LIB%"
4548
- if [%COMPILER%]==[clang-cl] set "CPATH=%CONDA_INSTALL_LOCN%\Library\include;%CPATH%"

0 commit comments

Comments
 (0)