diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-01-24 18:08:37 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-01-24 18:08:37 +0000 |
| commit | 1c0cac23cf1bf019bf54cc836910dbefda9bc84e (patch) | |
| tree | d1bb57d591d89f1d6291dfe89800813a54b77892 /Makefile.inc1 | |
| parent | a94a2945be9bad33563a9de9bdcba1ef276ba555 (diff) | |
| download | src-1c0cac23cf1bf019bf54cc836910dbefda9bc84e.tar.gz src-1c0cac23cf1bf019bf54cc836910dbefda9bc84e.zip | |
X_COMPILER_* may not be defined.
Sponsored by: Dell EMC
Notes
Notes:
svn path=/head/; revision=328347
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 92d89e1f77a8..e204553dd7ad 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -637,7 +637,8 @@ XCFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib # 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${XDDESTDIR}/usr/lib # 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 |