diff options
Diffstat (limited to 'cppunit/makefile.mk')
| -rw-r--r-- | cppunit/makefile.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index b57c341e2a23..5ef6499726e5 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19 # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/ # cppunit-1.12.1.tar.gz/download> -PATCH_FILES = solarisfinite.patch warnings.patch windows.patch +PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail& # aid=2912590&group_id=11795&atid=311795> # warnings.patch: see <https://sourceforge.net/tracker/?func=detail& @@ -91,13 +91,15 @@ OOO_STLPORT_LIBS = $(LIBSTLPORT) # reference to `_rtld_global_ro@GLIBC_PRIVATE'" unless -lm is also specified: .IF "$(OS)" == "LINUX" && "$(COM)" == "GCC" && "$(CPU)" == "I" OOO_STLPORT_LIBS += -lm +# #i112124# furthermore, STLPort seems to require libstdc++ +OOO_STLPORT_LIBS += -lstdc++ .END # And later, when "checking whether the C compiler works" configure tries to # execute that program; however, the program would fail to locate the STLport # library (another work-around might be to add something like --as-needed around # $(LIBSTLPORT)): -.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" +.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" .IF "$(LD_LIBRARY_PATH)" == "" LD_LIBRARY_PATH := $(SOLARLIBDIR) # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment |