Skip to content

Commit 5b6dc4c

Browse files
committed
copy llvm-mt to neutral location
1 parent f16d086 commit 5b6dc4c

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

.github/workflows/windows.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,6 @@ jobs:
3838
python-version: 3.11
3939
architecture: ${{ matrix.plat }}
4040

41-
- name: Download and install LLVM (arm64) and other tools
42-
shell: pwsh
43-
run: |
44-
Invoke-WebRequest https://github.com/llvm/llvm-project/releases/download/llvmorg-21.1.0/LLVM-21.1.0-woa64.exe -UseBasicParsing -OutFile LLVM-woa64.exe
45-
Start-Process -FilePath ".\LLVM-woa64.exe" -ArgumentList "/S" -Wait
46-
Invoke-WebRequest https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe -UseBasicParsing -Outfile rustup-init.exe
47-
$env:PATH="$env:PATH;$env:USERPROFILE\.cargo\bin"
48-
pip install anaconda-client
49-
python -m pip install cmake ninja
50-
5141
- name: Setup conda
5242
# No conda for arm64
5343
if: matrix.os == 'windows-latest'
@@ -59,11 +49,22 @@ jobs:
5949
miniforge-version: latest
6050

6151
- name: Install compilers and python from conda
62-
# No conda for arm64, but no flang-new for x86
52+
# No conda for arm64
6353
if: matrix.os == 'windows-latest'
6454
shell: bash -el {0}
6555
run: conda install compilers python==3.11 cmake ninja anaconda-client
6656

57+
- name: Download and install LLVM (arm64) and other tools
58+
if: matrix.os == 'windows-11-arm'
59+
shell: pwsh
60+
run: |
61+
Invoke-WebRequest https://github.com/llvm/llvm-project/releases/download/llvmorg-21.1.0/LLVM-21.1.0-woa64.exe -UseBasicParsing -OutFile LLVM-woa64.exe
62+
Start-Process -FilePath ".\LLVM-woa64.exe" -ArgumentList "/S" -Wait
63+
Invoke-WebRequest https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe -UseBasicParsing -Outfile rustup-init.exe
64+
$env:PATH="$env:PATH;$env:USERPROFILE\.cargo\bin"
65+
pip install anaconda-client
66+
python -m pip install cmake ninja
67+
6768
- name: Set env variables
6869
run: |
6970
echo "START_DIR=$PWD" >> $env:GITHUB_ENV

tools/build_steps_windows.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ echo "using C compiler $(which $CC), --version:"
6767
$CC --version
6868
echo "using F compiler $(which $FC), --version:"
6969
$FC --version
70+
mkdir -p /c/temp
71+
cp $(which llvm-mt.exe) /c/temp
72+
/c/temp/llvm-mt.exe /?
7073

7174
# Set suffixed-ILP64 flags
7275
if [ "$if_bits" == "64" ]; then
@@ -105,7 +108,7 @@ cmake .. -G Ninja \
105108
-DCMAKE_Fortran_COMPILER=$FC \
106109
-DBUILD_SHARED_LIBS=ON \
107110
-DCMAKE_SYSTEM_PROCESSOR=$march \
108-
-DCMAKE_MT=C:\\PROGRA~1\\LLVM\\bin\\llvm-mt.exe \
111+
-DCMAKE_MT=C:\\temp\\llvm-mt.exe \
109112
-DCMAKE_SYSTEM_NAME=Windows \
110113
-DSYMBOLPREFIX="scipy_" \
111114
-DLIBNAMEPREFIX="scipy_" \

0 commit comments

Comments
 (0)