From 957bb12050062c2b4fc2a272600cc9f22bffbab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20M=C3=BCller?= Date: Wed, 25 Jan 2023 15:45:59 +0100 Subject: [PATCH] Win32: Cross-compile with -Duse_pcre2 --- .github/workflows/win.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 6bc5bc07e5dc..52df6f9cee10 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -15,7 +15,7 @@ jobs: make deps - name: Cross-compile Crystal run: | - LLVM_TARGETS=X86 bin/crystal build --cross-compile --target x86_64-pc-windows-msvc src/compiler/crystal.cr -Dwithout_playground -Dwithout_iconv -Dwithout_interpreter + LLVM_TARGETS=X86 bin/crystal build --cross-compile --target x86_64-pc-windows-msvc src/compiler/crystal.cr -Dwithout_playground -Dwithout_iconv -Dwithout_interpreter -Duse_pcre2 - name: Upload Crystal object file uses: actions/upload-artifact@v3 @@ -251,7 +251,6 @@ jobs: mv mpir/lib/x64/Release/mpir.lib libs/ mv libyaml/Release/yaml.lib libs/ mv libxml2/Release/libxml2s.lib libs/xml2.lib - dir libs - name: Cache OpenSSL id: cache-openssl @@ -333,7 +332,7 @@ jobs: run: make -f Makefile.win deps - name: Link Crystal executable run: | - Invoke-Expression "cl crystal.obj /Fecrystal src\llvm\ext\llvm_ext.obj $(llvm\bin\llvm-config.exe --libs) libs\pcre.lib libs\gc.lib WS2_32.lib advapi32.lib libcmt.lib dbghelp.lib ole32.lib shell32.lib legacy_stdio_definitions.lib /link /LIBPATH:$(pwd)\libs /STACK:0x800000 /ENTRY:wmainCRTStartup" + Invoke-Expression "cl crystal.obj /Fecrystal src\llvm\ext\llvm_ext.obj $(llvm\bin\llvm-config.exe --libs) libs\pcre2-8.lib libs\gc.lib WS2_32.lib advapi32.lib libcmt.lib dbghelp.lib ole32.lib shell32.lib legacy_stdio_definitions.lib /link /LIBPATH:$(pwd)\libs /STACK:0x800000 /ENTRY:wmainCRTStartup" mkdir .build mv crystal.exe .build/