diff options
| author | tono <tono@openoffice.org> | 2010-06-20 01:08:33 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2010-06-20 01:08:33 +0900 |
| commit | 6dcf4ddec31de866816fc788ee07d60f8853caa0 (patch) | |
| tree | caafe2c25c56e9ffadba8286bbd0a0f9d0fc2ad4 /cppunit | |
| parent | 8b741ce734483fc7e463de71451009b948aaa911 (diff) | |
i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 more relevant fix
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/makefile.mk | 41 |
1 files changed, 36 insertions, 5 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 883a83ff2317..aae2d45053c9 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -74,8 +74,44 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk .IF "$(COM)" == "GCC" EXTRA_CFLAGS += -mthreads LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2 + +.IF "$(USE_SYSTEM_STL)" != "YES" + +OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl +.IF "$(USE_STLP_DEBUG)" == "TRUE" +OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG +.END +OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) + +OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR) +OOO_STLPORT_LIBS = $(LIBSTLPORT) + +.END + +CONFIGURE_ACTION = ./configure +CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ + pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \ + --disable-dependency-tracking --disable-static --disable-doxygen \ + --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \ + CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \ + LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \ + LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)' + +BUILD_ACTION = $(GNUMAKE) +BUILD_FLAGS = install + +OUTDIR2INC = ooo-install/include/cppunit + +OUT2BIN = ooo-install/bin/DllPlugInTester.exe \ + ooo-install/bin/cygcppunit-1-12-1.dll + +.INCLUDE: set_ext.mk +.INCLUDE: target.mk +.INCLUDE: tg_ext.mk + .ENDIF # "$(COM)" == "GCC" .ENDIF # "$(COM)" == "MSC" + .ELSE .IF "$(USE_SYSTEM_STL)" != "YES" @@ -139,10 +175,6 @@ BUILD_FLAGS = install OUTDIR2INC = ooo-install/include/cppunit -.IF "$(OS)" == "WNT" -OUT2BIN = ooo-install/bin/DllPlugInTester.exe \ - ooo-install/bin/cygcppunit-1-12-1.dll -.ELSE OUT2BIN = ooo-install/bin/DllPlugInTester .IF "$(OS)" == "MACOSX" OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib @@ -150,7 +182,6 @@ EXTRPATH = NONE .ELSE OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1 .END -.END .INCLUDE: set_ext.mk .INCLUDE: target.mk |