Date: Wed, 24 Jan 2018 18:08:37 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328347 - head Message-ID: <201801241808.w0OI8bLE068288@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Jan 24 18:08:37 2018 New Revision: 328347 URL: https://svnweb.freebsd.org/changeset/base/328347 Log: X_COMPILER_* may not be defined. Sponsored by: Dell EMC Modified: head/Makefile.inc1 head/Makefile.libcompat Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed Jan 24 17:58:48 2018 (r328346) +++ head/Makefile.inc1 Wed Jan 24 18:08:37 2018 (r328347) @@ -637,7 +637,8 @@ XCFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTM # combined with --sysroot. XCFLAGS+= -B${WORLDTMP}/usr/lib # Force using libc++ for external GCC. -.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 +.if defined(X_COMPILER_TYPE) && \ + ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 XCXXFLAGS+= -isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \ -nostdinc++ .endif @@ -2880,7 +2881,8 @@ CD2CFLAGS+= -isystem ${XDDESTDIR}/usr/include -L${XDDE # combined with --sysroot. CD2CFLAGS+= -B${XDDESTDIR}/usr/lib # Force using libc++ for external GCC. -.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 +.if defined(X_COMPILER_TYPE) && \ + ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 CD2CXXFLAGS+= -isystem ${XDDESTDIR}/usr/include/c++/v1 -std=c++11 \ -nostdinc++ .endif Modified: head/Makefile.libcompat ============================================================================== --- head/Makefile.libcompat Wed Jan 24 17:58:48 2018 (r328346) +++ head/Makefile.libcompat Wed Jan 24 18:08:37 2018 (r328347) @@ -108,7 +108,8 @@ LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat # sysroot path which --sysroot does not actually do for headers. LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include # Force using libc++ for external GCC. -.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 && \ +.if defined(X_COMPILER_TYPE) && \ + ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 && \ (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no") LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \ -nostdinc++
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801241808.w0OI8bLE068288>