After r253839, which modifies ld's behaviour to not automatically pull

in needed libraries, change libc++.so into a linker script, so it can automatically pull in libcxxrt.so. MFC after: 1 week
nvask · Aug 3, 2013 · 792f34f · 792f34f
1 parent 4a8fef8
commit 792f34f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
@@ -9,6 +9,7 @@ CXXINCLUDEDIR=	${INCLUDEDIR}/c++/v${SHLIB_MAJOR}
 
 LIB=		c++
 SHLIB_MAJOR=	1
+SHLIB_LDSCRIPT=	libc++.ldscript
 
 SRCS+=		algorithm.cpp\
 		bind.cpp\

diff --git a/lib/libc++/libc++.ldscript b/lib/libc++/libc++.ldscript
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+GROUP ( @@SHLIB@@ @@LIBDIR@@/libcxxrt.so )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/* $FreeBSD$ */
		GROUP ( @@SHLIB@@ @@LIBDIR@@/libcxxrt.so )