From 5c0333020b32312b59d1b4d89d25b7e8e33d95df Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Mon, 4 May 2020 18:18:19 +0300 Subject: [PATCH] better fix for ticket:#5933, link libcurl statically on mingw --- OMCompiler/Compiler/boot/Makefile.omdev.mingw | 4 ++-- OMCompiler/Compiler/runtime/om_curl.c | 5 +++++ OMCompiler/Makefile.omdev.mingw | 22 ------------------- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/OMCompiler/Compiler/boot/Makefile.omdev.mingw b/OMCompiler/Compiler/boot/Makefile.omdev.mingw index 1097278c5de..92999c86215 100644 --- a/OMCompiler/Compiler/boot/Makefile.omdev.mingw +++ b/OMCompiler/Compiler/boot/Makefile.omdev.mingw @@ -30,12 +30,12 @@ LDFLAGS=-L./ $(LOMPARSE) $(LCOMPILERRUNTIME) -L"$(OMHOME)/lib/omc" \ -lModelicaExternalC -lModelicaIO -lModelicaMatIO -lhdf5 -lszip -lm \ -lomantlr3 -lregex -lwsock32 -llpsolve55 -luuid -lole32 -lws2_32 -limagehlp \ -lRpcrt4 -lopenblas -fopenmp -lomcgc -lpthread $(FMILIB_OR_BOOT) -lshlwapi -liconv -lintl -lmetis \ --Wl,--enable-stdcall-fixup -Bstatic -lstdc++ -Bdynamic -static-libgcc \ +-Wl,--enable-stdcall-fixup -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -static-libgcc \ -L../../3rdParty/lpsolve/build/lib \ -lgfortran -ltre -lomniORB420_rt -lomnithread40_rt \ -lzmq \ $(OMENCRYPTIONLIBS) \ --lcurl \ +-Wl,-Bstatic -lcurl -lidn -lrtmp -lssh2 -lssl -lcrypto -lgdi32 -lwldap32 -lz -lws2_32 -lgnutls -ltasn1 -lhogweed -lgmp -lnettle -Wl,-Bdynamic -lcrypt32 -lintl -lp11-kit -lwinmm -lgdi32 \ $(EXTRA_LD_FLAGS) FMILIB = -L$(TOP_DIR)/3rdParty/FMIL/install/lib -lfmilib diff --git a/OMCompiler/Compiler/runtime/om_curl.c b/OMCompiler/Compiler/runtime/om_curl.c index e2bc68d3043..1169bbeabe8 100644 --- a/OMCompiler/Compiler/runtime/om_curl.c +++ b/OMCompiler/Compiler/runtime/om_curl.c @@ -1,3 +1,8 @@ + + +#if defined(__MINGW32__) +#define CURL_STATICLIB 1 +#endif #include #include "meta/meta_modelica.h" #include "util/omc_file.h" diff --git a/OMCompiler/Makefile.omdev.mingw b/OMCompiler/Makefile.omdev.mingw index 8ed7356f1b8..19cd345b71d 100644 --- a/OMCompiler/Makefile.omdev.mingw +++ b/OMCompiler/Makefile.omdev.mingw @@ -235,19 +235,8 @@ ifeq (MINGW32,$(findstring MINGW32,$(shell uname))) (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/zlib1.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libszip*.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libhdf5-0.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libcurl*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libidn*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/librtmp*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libgmp*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libgnutls*.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libp11-kit*.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libffi*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libtasn1*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libhogweed*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libnettle*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libssh2*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/ssleay32.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw32/bin/libeay32.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/lib/omniORB-4.2.0-mingw32/bin/x86_win32/omniORB420_rt.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/lib/omniORB-4.2.0-mingw32/bin/x86_win32/omnithread40_rt.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/lib/omniORB-4.2.0-mingw32/bin/x86_win32/omniORB420_rt.dll $(builddir_lib)/omc/) @@ -275,19 +264,8 @@ else # mingw64 (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/zlib1.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libszip*.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libhdf5-0.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libcurl*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libidn*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/librtmp*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libgmp*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libgnutls*.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libp11-kit*.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libffi*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libtasn1*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libhogweed*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libnettle*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libssh2*.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/ssleay32.dll $(builddir_bin)/) - (cp -puf $(OMDEVMSYS)/tools/msys/mingw64/bin/libeay32.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/lib/omniORB-4.2.0-mingw64/bin/x86_win32/omniORB420_rt.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/lib/omniORB-4.2.0-mingw64/bin/x86_win32/omnithread40_rt.dll $(builddir_bin)/) (cp -puf $(OMDEVMSYS)/lib/omniORB-4.2.0-mingw64/bin/x86_win32/omniORB420_rt.dll $(builddir_lib)/omc/)