From 47b93186270f8f72a8a0229c08871b7a613484a4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 15 Jul 2024 19:16:05 +1100 Subject: [PATCH 4/5] add `-ldl` to libstdc___la_LDFLAGS we want to link static-only here, to avoid having to add `-ldl` everytime something links against libstdc++.so Co-Authored-By: Isuru Fernando --- libstdc++-v3/src/Makefile.am | 2 +- libstdc++-v3/src/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 37ba1491d..5b69f43ec 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -161,7 +161,7 @@ libstdc___darwin_rpath += -Wl,-rpath,@loader_path endif libstdc___la_LDFLAGS = \ - -version-info $(libtool_VERSION) ${version_arg} -lm $(libstdc___darwin_rpath) + -version-info $(libtool_VERSION) ${version_arg} -lm -Bstatic -ldl -Bdynamic -Wl,--exclude-libs,libdl.a $(libstdc___darwin_rpath) libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) $(lt_host_flags) diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 1bdf0daa8..ab28e1480 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -566,7 +566,7 @@ libstdc___la_DEPENDENCIES = \ @ENABLE_DARWIN_AT_RPATH_TRUE@ -Wc,-nodefaultrpaths \ @ENABLE_DARWIN_AT_RPATH_TRUE@ -Wl,-rpath,@loader_path libstdc___la_LDFLAGS = \ - -version-info $(libtool_VERSION) ${version_arg} -lm $(libstdc___darwin_rpath) + -version-info $(libtool_VERSION) ${version_arg} -lm -Bstatic -ldl -Bdynamic -Wl,--exclude-libs,libdl.a $(libstdc___darwin_rpath) libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) $(lt_host_flags) @GLIBCXX_LDBL_ALT128_COMPAT_FALSE@@GLIBCXX_LDBL_COMPAT_TRUE@LTCXXCOMPILE64 = $(LTCXXCOMPILE)