Date: Tue, 8 Apr 2014 15:16:39 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350623 - head/Mk/Uses Message-ID: <201404081516.s38FGdsT070098@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Apr 8 15:16:39 2014 New Revision: 350623 URL: http://svnweb.freebsd.org/changeset/ports/350623 QAT: https://qat.redports.org/buildarchive/r350623/ Log: Add compiler:gcc-c++11-lib to instrument gcc linking with libc++ on system where default stl is libc++ Modified: head/Mk/Uses/compiler.mk Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Tue Apr 8 15:15:31 2014 (r350622) +++ head/Mk/Uses/compiler.mk Tue Apr 8 15:16:39 2014 (r350623) @@ -8,6 +8,7 @@ # # c++0x: The port needs a compiler understanding C++0X # c++11-lang: The port needs a compiler understanding C++11 +# gcc-c++11-lib:The port needs g++ compiler with a C++11 library # c++11-lib: The port needs a compiler understanding C++11 and with a C++11 ready standard library # c11: The port needs a compiler understanding C11 # openmp: The port needs a compiler understanding openmp @@ -33,9 +34,11 @@ _INCLUDE_USES_COMPILER_MK= yes compiler_ARGS= env .endif -VALID_ARGS= c++11-lib c++11-lang c11 features openmp env nestedfct c++0x +VALID_ARGS= c++11-lib c++11-lang c11 features openmp env nestedfct c++0x gcc-c++11-lib -.if ${compiler_ARGS} == c++11-lib +.if ${compiler_ARGS} == gcc-c++11-lib +_COMPILER_ARGS+= features gcc-c++11-lib +.elif ${compiler_ARGS} == c++11-lib _COMPILER_ARGS+= features c++11-lib .elif ${compiler_ARGS} == c++0x _COMPILER_ARGS+= features c++0x @@ -211,4 +214,13 @@ LDFLAGS+= -B${LOCALBASE}/bin .endif .endif +.if ${_COMPILER_ARGS:Mgcc-c++11-lib} +USE_GCC= yes +.if ${COMPILER_FEATURES:Mlibc++} +LDFLAGS+= -L${LOCALBASE}/lib/c++ +CXXFLAGS+= -nostdinc++ -isystem ${LOCALBASE}/include/c++/v1 +BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++ +.endif +.endif + .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404081516.s38FGdsT070098>