Author: bdrewery
Date: Fri May 27 23:03:28 2016
New Revision: 300885
URL: https://svnweb.freebsd.org/changeset/base/300885
Log:
Libcompat: Only pass -isystem =/usr/include for external GCC.
This is the same as the main build logic. GCC with a cross-compiler
requires using -isystem to =/usr/include to get the search order
correct.
Reported by: dim, asomers
Sponsored by: EMC / Isilon Storage Division
Modified:
head/Makefile.libcompat
Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat Fri May 27 22:56:00 2016 (r300884)
+++ head/Makefile.libcompat Fri May 27 23:03:28 2016 (r300885)
@@ -72,10 +72,9 @@ LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \
# -B is needed to find /usr/lib32/crti.o for GCC and /usr/libsoft/crti.o for
# Clang/GCC.
LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat}
+.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
# GCC requires -isystem when using a cross-compiler.
LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include
-
-.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
# Force using libc++ for external GCC.
LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
-nostdinc++ -L${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc++
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
