Skip to content

Commit 8413671

Browse files
committed
- change the order of libraries with duplicate symbols when linking otherwise the solver cycles forever.
- use tee in windows testsuite git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20009 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent edc5e21 commit 8413671

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Compiler/runtime/config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
#endif
5656

5757
/* adrpo: add -loleaut32 as is used by ExternalMedia */
58-
#define BASIC_LDFLAGS_RT " -Wl,--allow-multiple-definition -lgc -lexpat -lregex -static-libgcc -luuid -loleaut32 -lole32 -lws2_32 -lsundials_kinsol -lsundials_nvecserial -lipopt -lcoinmumps -lcoinmetis -lpthread -lm -lgfortranbegin -lgfortran -lmingw32 -lgcc_eh -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -llapack-mingw -ltmglib-mingw -lblas-mingw -lf2c"
58+
#define BASIC_LDFLAGS_RT " -Wl,--allow-multiple-definition -lgc -lexpat -lregex -static-libgcc -luuid -loleaut32 -lole32 -lws2_32 -lsundials_kinsol -lsundials_nvecserial -lipopt -lcoinmumps -lcoinmetis -lpthread -lm -lgfortranbegin -lgfortran -lmingw32 -lgcc_eh -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lcdaskr -llapack-mingw -ltmglib-mingw -lblas-mingw -lf2c"
5959
#define LDFLAGS_RT " -lOpenModelicaRuntimeC" BASIC_LDFLAGS_RT
60-
#define LDFLAGS_RT_SIM " -lSimulationRuntimeC" BASIC_LDFLAGS_RT " -linteractive -lwsock32 -llis -lcdaskr -lstdc++"
60+
#define LDFLAGS_RT_SIM " -lSimulationRuntimeC" BASIC_LDFLAGS_RT " -linteractive -lwsock32 -llis -lstdc++"
6161
#define CONFIG_EXE_EXT ".exe"
6262
#define CONFIG_DLL_EXT ".dll"
6363
#define CONFIG_OS "Windows_NT"

0 commit comments

Comments
 (0)