Skip to content

Commit 2039fd1

Browse files
committed
Fix builds for ONNX Runtime
1 parent 32a2fd7 commit 2039fd1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/actions/deploy-windows/action.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runs:
1313
C:\msys64\usr\bin\bash -lc "pacman -S --needed --noconfirm pkg-config"
1414
C:\msys64\usr\bin\bash -lc "pacman -S --needed --noconfirm base-devel git tar unzip p7zip zip autoconf autoconf-archive automake libtool make patch gnupg"
1515
C:\msys64\usr\bin\bash -lc "pacman -S --needed --noconfirm mingw-w64-x86_64-nasm mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-gcc mingw-w64-i686-gcc mingw-w64-x86_64-gcc-fortran mingw-w64-i686-gcc-fortran mingw-w64-x86_64-libwinpthread-git mingw-w64-i686-libwinpthread-git mingw-w64-x86_64-SDL2 mingw-w64-i686-SDL2 mingw-w64-x86_64-ragel mingw-w64-x86_64-vulkan-headers mingw-w64-i686-vulkan-headers mingw-w64-x86_64-vulkan-loader mingw-w64-i686-vulkan-loader"
16-
set "PATH=C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\msys64\usr\bin;%PATH%"
16+
set "PATH=C:\hostedtoolcache\windows\Python\3.10.11\x64;C:\msys64\usr\bin;%PATH%"
1717
1818
C:\msys64\usr\bin\bash -lc "pacman -Q"
1919
@@ -218,7 +218,7 @@ runs:
218218
echo CUDA Version 12.6.2>"%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.6\version.txt"
219219
)
220220
set "CCACHE_DIR=%USERPROFILE%\ccache"
221-
set "PATH=C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%ProgramFiles%\apache-maven-3.6.3\bin;%PATH%"
221+
set "PATH=C:\hostedtoolcache\windows\Python\3.10.11\x64;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%ProgramFiles%\apache-maven-3.6.3\bin;%PATH%"
222222
223223
where bash
224224
where curl
@@ -307,5 +307,5 @@ runs:
307307
shell: cmd
308308
run: |
309309
cd /d %USERPROFILE%
310-
set "PATH=C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\msys64\usr\bin;%PATH%"
310+
set "PATH=C:\hostedtoolcache\windows\Python\3.10.11\x64;C:\msys64\usr\bin;%PATH%"
311311
bash -c "rm -Rf $(find .m2/repository/ -name '*SNAPSHOT*')"

onnxruntime/onnxruntime.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ index 6c1d4485eb..6b1a6440b4 100644
2929
if(UNIX)
3030
if (APPLE)
3131
- target_link_options(onnxruntime PRIVATE "LINKER:-dead_strip")
32-
+ target_link_options(onnxruntime PRIVATE "LINKER:-L/usr/local/lib" "LINKER:-lomp")
32+
+ target_link_options(onnxruntime PRIVATE "LINKER:-L/usr/local/lib")
3333
elseif(NOT CMAKE_SYSTEM_NAME MATCHES "AIX")
3434
- target_link_options(onnxruntime PRIVATE "LINKER:--version-script=${SYMBOL_FILE}" "LINKER:--no-undefined" "LINKER:--gc-sections")
3535
+ target_link_options(onnxruntime PRIVATE "LINKER:--no-undefined")

0 commit comments

Comments
 (0)