Skip to content

Commit 4f73919

Browse files
authored
Fix mingw dll issues (HaxeFoundation#1046)
* Allow dynamic linking with mingw on linux * Update copied mingw libraries Add 64-bit gcc library Add another winpthread location
1 parent 5b23e36 commit 4f73919

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

toolchain/mingw-toolchain.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,19 @@
7474
<flag value="-m32" unless="HXCPP_M64"/>
7575
<flag value="-m64" if="HXCPP_M64"/>
7676
<flag value="-static" if="no_shared_libs"/>
77-
<flag value="-static-libgcc" if="no_shared_libs" unless="linux_host"/>
78-
<flag value="-static-libstdc++" if="no_shared_libs" unless="linux_host"/>
79-
<flag value="-static-libgcc" if="linux_host"/>
80-
<flag value="-static-libstdc++" if="linux_host"/>
77+
<flag value="-static-libgcc" if="no_shared_libs" />
78+
<flag value="-static-libstdc++" if="no_shared_libs" />
8179
<flag value="-L${MINGW_ROOT}/lib/libs" />
8280
<ext value=".exe"/>
8381
<outflag value="-o "/>
8482
</linker>
8583

86-
<copyFile toolId="exe" name="libgcc_s_dw2-1.dll" from="${MINGW_ROOT}/bin" allowMissing="true" unless="no_shared_libs"/>
84+
<copyFile toolId="exe" name="libgcc_s_dw2-1.dll" from="${MINGW_ROOT}/bin" allowMissing="true" unless="no_shared_libs || HXCPP_M64" />
85+
<copyFile toolId="exe" name="libgcc_s_seh-1.dll" from="${MINGW_ROOT}/bin" allowMissing="true" if="HXCPP_M64" unless="no_shared_libs"/>
8786
<copyFile toolId="exe" name="libstdc++-6.dll" from="${MINGW_ROOT}/bin" allowMissing="true" unless="no_shared_libs"/>
8887
<copyFile toolId="exe" name="libwinpthread-1.dll" from="${MINGW_ROOT}/sys-root/mingw/bin" allowMissing="true" unless="no_shared_libs"/>
8988
<copyFile toolId="exe" name="libwinpthread-1.dll" from="${MINGW_ROOT}/lib" allowMissing="true" unless="no_shared_libs"/>
89+
<copyFile toolId="exe" name="libwinpthread-1.dll" from="${MINGW_ROOT}/bin" allowMissing="true" unless="no_shared_libs"/>
9090

9191
<linker id="static_link" exe="ar" >
9292
<ext value="${LIBEXT}"/>

0 commit comments

Comments
 (0)