WITH_SYSTEM_COMPILER: Avoid using GCC4.8+ logic on native GCC4.2 platforms.

As the XXX notes, these should really be checking MK_GNUCXX since there is
already a version check in share/mk/src.opts.mk to disable it.  Fixing that
here is more complex though.  This could also be using X_COMPILER_FEATURES
but uses X_COMPILER_VERSION to keep in sync with the src.opts.mk logic.

Tested by:	andreast
Sponsored by:	EMC / Isilon Storage Division
Approved by:	re (gjb)

This commit is contained in:

Bryan Drewery

2016-06-29 01:50:30 +00:00

parent 6481f66b90

commit 48413367ef

2 changed files with 4 additions and 2 deletions

									
										Makefile.inc1
									
		+2
		
												View File
												
				@@ -549,8 +549,10 @@ TARGET_ABI=	gnueabi

				XCFLAGS+=	-isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib

				# Force using libc++ for external GCC.

				# 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++

				.endif

				.else

				TARGET_ABI?=	unknown

				TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0