summaryrefslogtreecommitdiffstats
path: root/Makefile.libcompat
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-07-27 05:38:09 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-07-27 05:38:09 +0000
commit30e93045c8569f806b73624f18998b7a6e531ff1 (patch)
tree7d4eeeef096b2260e8534d925f26b770562b0483 /Makefile.libcompat
parent2f608e00b7ea86d9e3f727c11a4f74534866e077 (diff)
downloadFreeBSD-src-30e93045c8569f806b73624f18998b7a6e531ff1.zip
FreeBSD-src-30e93045c8569f806b73624f18998b7a6e531ff1.tar.gz
MFC r303274:
Don't disable binutils/elftoolchain bootstrapping with external compiler. Approved by: re (kib)
Diffstat (limited to 'Makefile.libcompat')
-rw-r--r--Makefile.libcompat4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat
index 3182c8c..9fbfa07 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -81,8 +81,8 @@ LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat}
LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include
# Force using libc++ for external GCC.
# XXX: This should be checking MK_GNUCXX == no
-.if ${X_COMPILER_VERSION} >= 40800 && (${MK_CROSS_COMPILER} == "no" || \
- (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no"))
+.if ${X_COMPILER_VERSION} >= 40800 && \
+ (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no")
LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
-nostdinc++ -L${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc++
.endif
OpenPOWER on IntegriCloud