Skip to content

Commit

Permalink
Bump bundled dub to custom v1.32.1, and reggae to latest master with …
Browse files Browse the repository at this point in the history
…that custom dub

dub was customized to apply dflags affecting symbol visibility to
*all* deps with LDC on Windows, something we need for SIL and
plugins on Windows (adding `-fvisibility=hidden` and
`-dllimport=defaultLibsOnly` in lang's dub.sdl). The previous
ldc2.conf tweaks aren't sufficient anymore after
dlang/dub#2412.

See symmetryinvestments/dub@0158ab3.
  • Loading branch information
kinke committed May 12, 2023
1 parent f497024 commit f3fb263
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/actions/7-package/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ runs:
copy build\ninja.exe ..\installed\bin\ || exit /b
..\installed\bin\ninja --version || exit /b
- name: 'Symmetry: Add default switches `-link-internally -link-defaultlib-shared` to Windows ldc2.conf'
- name: 'Symmetry: Add default switch `-link-internally` to Windows ldc2.conf'
if: runner.os == 'Windows'
shell: pwsh
run: |
cd ..\installed
(cat etc\ldc2.conf).replace('"-defaultlib=phobos2-ldc,druntime-ldc",', '"-defaultlib=phobos2-ldc,druntime-ldc", "-link-internally", "-link-defaultlib-shared",') | Set-Content etc\ldc2.conf
(cat etc\ldc2.conf).replace('"-defaultlib=phobos2-ldc,druntime-ldc",', '"-defaultlib=phobos2-ldc,druntime-ldc", "-link-internally",') | Set-Content etc\ldc2.conf
cat etc\ldc2.conf
- name: Pack installation dir
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/merge-windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ runs:
run: |
echo on
@echo Run 32/64-bit hello-world smoke test with internal toolchain
ldc2-multilib\bin\ldc2 -v -mscrtlib=vcruntime140 -link-defaultlib-shared=false -run hello.d || exit /b
ldc2-multilib\bin\ldc2 -v -mscrtlib=vcruntime140 -link-defaultlib-shared=false -m32 -run hello.d || exit /b
ldc2-multilib\bin\ldc2 -v -mscrtlib=vcruntime140 -run hello.d || exit /b
ldc2-multilib\bin\ldc2 -v -mscrtlib=vcruntime140 -m32 -run hello.d || exit /b
@echo Run 32/64-bit hello-world smoke test with MSVC auto-detection
ldc2-multilib\bin\ldc2 -v -link-defaultlib-shared=false -run hello.d || exit /b
ldc2-multilib\bin\ldc2 -v -link-defaultlib-shared=false -m32 -run hello.d || exit /b
ldc2-multilib\bin\ldc2 -v -run hello.d || exit /b
ldc2-multilib\bin\ldc2 -v -m32 -run hello.d || exit /b
@echo Run 32/64-bit hello-world smoke test with shared libs
set PATH=%CD%\ldc2-multilib\bin;%PATH%
Expand Down
2 changes: 1 addition & 1 deletion packaging/dub_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f40784740bfff796b89602289b3026410a36e43e
0158ab32a3f0894a75dea6c4c4c2f2cb1f5aba5f
2 changes: 1 addition & 1 deletion packaging/reggae_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6303453d96c7ba515b64de4dac7fd424b61d33a5
76b228224aafa70187bbb7a53ad91f193b1c1d8d

0 comments on commit f3fb263

Please sign in to comment.