diff options
| author | Jérôme Martinez <jerome@mediaarea.net> | 2021-01-03 01:24:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 01:24:05 +0300 |
| commit | 2f0c1b80a4032c310d267903f9a1d627369492f1 (patch) | |
| tree | 932931b5b9d7d7727e994b06eb4e27665392adef | |
| parent | 11a96d5e88f1614c200910b77117f9c8790b1fd1 (diff) | |
| parent | d5081067f9f3082be0a242cef2b2f0ae2e0937de (diff) | |
Merge pull request #124 from g-maxime/m1
Remove hardcoded libstdc++ linking
| -rw-r--r-- | Project/CMake/libzen.pc.in | 4 | ||||
| -rw-r--r-- | Project/GNU/Library/configure.ac | 6 | ||||
| -rw-r--r-- | Project/GNU/Library/libzen.pc.in | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Project/CMake/libzen.pc.in b/Project/CMake/libzen.pc.in index 2754be6..87063bc 100644 --- a/Project/CMake/libzen.pc.in +++ b/Project/CMake/libzen.pc.in @@ -3,10 +3,10 @@ exec_prefix=${prefix} libdir=@LIB_INSTALL_DIR@
includedir=@INCLUDE_INSTALL_DIR@
Unicode=@ZenLib_Unicode@
-Libs_Static=@LIB_INSTALL_DIR@/libzen.a -lpthread -lstdc++
+Libs_Static=@LIB_INSTALL_DIR@/libzen.a -lpthread
Name: libzen
Version: @ZenLib_VERSION@
Description: ZenLib
-Libs: -L${libdir} -lzen -lpthread -lstdc++
+Libs: -L${libdir} -lzen -lpthread
Cflags: -I${includedir} @ZenLib_CXXFLAGS@
diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac index da2b36c..1d8bb3e 100644 --- a/Project/GNU/Library/configure.ac +++ b/Project/GNU/Library/configure.ac @@ -144,10 +144,10 @@ dnl ------------------------------------------------------------------------- dnl Common dnl if test "$enable_shared" = "yes"; then - ZenLib_LIBS="-L$(pwd)/.libs -lzen -lpthread -lstdc++ $ZenLib_LIBS" + ZenLib_LIBS="-L$(pwd)/.libs -lzen -lpthread $ZenLib_LIBS" fi if test "$enable_static" = "yes"; then - ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread -lstdc++ $ZenLib_LIBS_Static" + ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread $ZenLib_LIBS_Static" fi dnl ######################################################################### @@ -252,7 +252,7 @@ fi dnl ------------------------------------------------------------------------- dnl External libs dnl -LDFLAGS="$LDFLAGS -lpthread -lstdc++" +LDFLAGS="$LDFLAGS -lpthread" dnl ######################################################################### dnl ### Output diff --git a/Project/GNU/Library/libzen.pc.in b/Project/GNU/Library/libzen.pc.in index c3e6778..f7bb814 100644 --- a/Project/GNU/Library/libzen.pc.in +++ b/Project/GNU/Library/libzen.pc.in @@ -9,5 +9,5 @@ Libs_Static=@libdir@/libzen.a -lpthread Name: libzen Version: @PACKAGE_VERSION@ Description: ZenLib -Libs: -L${libdir} -lzen -lpthread -lstdc++ +Libs: -L${libdir} -lzen -lpthread Cflags: -I${includedir} @ZenLib_CXXFLAGS@ |