Kaydet (Commit) 5256f32b authored tarafından tono's avatar tono

mingwport33: i#116329: MinGW port enhancement: configurable libstdc++ name

üst 0d958c48
...@@ -95,7 +95,7 @@ xmlsec_CC+=-shared-libgcc ...@@ -95,7 +95,7 @@ xmlsec_CC+=-shared-libgcc
.ENDIF .ENDIF
xmlsec_LIBS= xmlsec_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES" .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
xmlsec_LIBS+=-lstdc++_s xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF .ENDIF
CONFIGURE_DIR= CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure CONFIGURE_ACTION=.$/configure
......
...@@ -57,7 +57,7 @@ BUILD_DIR=lpsolve55 ...@@ -57,7 +57,7 @@ BUILD_DIR=lpsolve55
lpsolve_LDFLAGS=-shared-libgcc lpsolve_LDFLAGS=-shared-libgcc
.ENDIF .ENDIF
.IF "$(MINGW_SHARED_GXXLIB)"=="YES" .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
lpsolve_LIBS=-lstdc++_s lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF .ENDIF
BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
.ELSE .ELSE
......
...@@ -69,9 +69,9 @@ ...@@ -69,9 +69,9 @@
+goto finished +goto finished
+ +
+:shared_gxxlib +:shared_gxxlib
+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 -lstdc++_s +gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 %MINGW_SHARED_LIBSTDSPP%
+if errorlevel 1 goto end +if errorlevel 1 goto end
+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto -lstdc++_s +gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto %MINGW_SHARED_LIBSTDSPP%
+if errorlevel 1 goto end +if errorlevel 1 goto end
+goto finished +goto finished
......
...@@ -74,7 +74,7 @@ raptor_CC+=-shared-libgcc ...@@ -74,7 +74,7 @@ raptor_CC+=-shared-libgcc
.ENDIF .ENDIF
raptor_LIBS= raptor_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES" .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
raptor_LIBS+=-lstdc++_s raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF .ENDIF
CONFIGURE_DIR= CONFIGURE_DIR=
......
...@@ -72,7 +72,7 @@ rasqal_CC+=-shared-libgcc ...@@ -72,7 +72,7 @@ rasqal_CC+=-shared-libgcc
.ENDIF .ENDIF
rasqal_LIBS= rasqal_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES" .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
rasqal_LIBS+=-lstdc++_s rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF .ENDIF
CONFIGURE_DIR= CONFIGURE_DIR=
......
...@@ -72,7 +72,7 @@ redland_CC+=-shared-libgcc ...@@ -72,7 +72,7 @@ redland_CC+=-shared-libgcc
.ENDIF .ENDIF
redland_LIBS= redland_LIBS=
.IF "$(MINGW_SHARED_GXXLIB)"=="YES" .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
redland_LIBS+=-lstdc++_s redland_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF .ENDIF
CONFIGURE_DIR= CONFIGURE_DIR=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment