Commit cf94d16d7652f92ce97b8acdf6dccee131fa1159
1 parent
b5980c26
Exists in
master
and in
3 other branches
Fixin MSYS2 builds.
Showing
2 changed files
with
6 additions
and
5 deletions
Show diff stats
configure.ac
| ... | ... | @@ -65,7 +65,7 @@ DBG_CFLAGS="-g -fstack-check -DDEBUG=1" |
| 65 | 65 | RLS_CFLAGS="-DNDEBUG=1" |
| 66 | 66 | APP_RESOURCES="" |
| 67 | 67 | APP_LDFLAGS="" |
| 68 | -DLL_LDFLAGS="-shared" | |
| 68 | +DLL_LDFLAGS="-shared -Wl,-soname,\$(@F)" | |
| 69 | 69 | STATIC_LDFLAGS="" |
| 70 | 70 | |
| 71 | 71 | dnl --------------------------------------------------------------------------- |
| ... | ... | @@ -79,8 +79,8 @@ case "$host" in |
| 79 | 79 | app_cv_osname="windows" |
| 80 | 80 | CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" |
| 81 | 81 | LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" |
| 82 | - LDFLAGS="$LDFLAGS -pthread -static-libgcc -static-libstdc++" | |
| 83 | - DLL_LDFLAGS="-shared" | |
| 82 | + LDFLAGS="$LDFLAGS -pthread" | |
| 83 | + DLL_LDFLAGS="-shared -Wl,--output-def,\$@.def" | |
| 84 | 84 | DLLEXT=".dll" |
| 85 | 85 | |
| 86 | 86 | app_win32_revision=$(date +%y.%m.%d.%H) |
| ... | ... | @@ -119,6 +119,7 @@ AC_SUBST(LIBS) |
| 119 | 119 | AC_SUBST(LOGDIR) |
| 120 | 120 | AC_SUBST(DLLEXT) |
| 121 | 121 | AC_SUBST(DLLPREFIX) |
| 122 | +AC_SUBST(DLL_LDFLAGS) | |
| 122 | 123 | |
| 123 | 124 | dnl --------------------------------------------------------------------------- |
| 124 | 125 | dnl Check host compiler | ... | ... |
src/lib3270/Makefile.in
| ... | ... | @@ -205,7 +205,7 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ |
| 205 | 205 | @$(MKDIR) `dirname $@` |
| 206 | 206 | @echo $< ... |
| 207 | 207 | @$(LD) \ |
| 208 | - -shared -Wl,-soname,$(@F) \ | |
| 208 | + @DLL_LDFLAGS@ \ | |
| 209 | 209 | -o $@ \ |
| 210 | 210 | $(LDFLAGS) \ |
| 211 | 211 | $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \ |
| ... | ... | @@ -266,7 +266,7 @@ install-dev: |
| 266 | 266 | |
| 267 | 267 | @$(INSTALL_DATA) \ |
| 268 | 268 | ../include/lib3270/*.h \ |
| 269 | - $(DESTDIR)$(includedir)/lib3270 | |
| 269 | + $(DESTDIR)$(includedir)/lib3270 | |
| 270 | 270 | |
| 271 | 271 | @$(INSTALL_DATA) \ |
| 272 | 272 | ../include/lib3270.h \ | ... | ... |