diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-12-10 18:29:39 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-12-10 18:29:39 +0000 |
| commit | 629582ca4620880576b0434d234e43f375a0beb0 (patch) | |
| tree | 94f90fc726bf9b4bae4511c8386fe2814353ef0e | |
| parent | 4af79d4f2b824eb8695f874084da7d1682aa4d05 (diff) | |
| download | src-629582ca4620880576b0434d234e43f375a0beb0.tar.gz src-629582ca4620880576b0434d234e43f375a0beb0.zip | |
Now that external gcc directly natively links to libc++ we can remove
the dirty hack made to fake libstdc++
Notes
Notes:
svn path=/head/; revision=309824
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | lib/libc++/Makefile | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index a4a638cf0a1f..aa71e6862e01 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -591,7 +591,7 @@ XCFLAGS+= -B${WORLDTMP}/usr/lib # XXX: This should be checking MK_GNUCXX == no .if ${X_COMPILER_VERSION} >= 40800 XCXXFLAGS+= -isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \ - -nostdinc++ -L${WORLDTMP}/../lib/libc++ + -nostdinc++ .endif .elif ${WANT_COMPILER_TYPE} == clang || \ (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == clang) diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index 1a506578289c..36471f055eb6 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -242,14 +242,4 @@ EXT+= ${HDRDIR}/ext/${hdr} .endfor EXTDIR= ${CXXINCLUDEDIR}/ext -.if ${MK_GNUCXX} == "no" && ${COMPILER_TYPE} == "gcc" -CLEANFILES+= libstdc++.so libstdc++.a - -afterinstall: - ${INSTALL_SYMLINK} ${DESTDIR}${LIBDIR}/lib${LIB}.so \ - ${.OBJDIR}/libstdc++.so - ${INSTALL_SYMLINK} ${DESTDIR}${LIBDIR}/lib${LIB}.a \ - ${.OBJDIR}/libstdc++.a -.endif - .include <bsd.lib.mk> |