diff options
| author | dim <dim@FreeBSD.org> | 2011-11-26 03:26:06 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2011-11-26 03:26:06 +0000 |
| commit | 85d58c885455bf5b3bbe3d4ff65e93d6d4682de7 (patch) | |
| tree | 44b0bc4589c05e0ceaf7f09d403e39b5b539bc1f | |
| parent | ba968938a825d14728301fd5e903d6632483b883 (diff) | |
| download | FreeBSD-src-85d58c885455bf5b3bbe3d4ff65e93d6d4682de7.zip FreeBSD-src-85d58c885455bf5b3bbe3d4ff65e93d6d4682de7.tar.gz | |
Fix breakage after r227983; lib/libcxxrt still got built, because it was
not disabled in the usual way (by adding it to __DEFAULT_NO_OPTIONS in
share/mk/bsd.own.mk), and because the test for MK_LIBCPLUSPLUS in
Makefile.inc1 was incorrect.
Pointy hat to: dim
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | lib/Makefile | 15 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 3 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 5c9cafa..c953419 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1218,7 +1218,7 @@ _startup_libs+= lib/csu/${MACHINE_CPUARCH} _startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libcompiler_rt _startup_libs+= lib/libc -.if defined(MK_LIBCPLUSPLUS) +.if ${MK_LIBCPLUSPLUS} != "no" _startup_libs+= lib/libcxxrt .endif diff --git a/lib/Makefile b/lib/Makefile index 55b55ba..ad647ec 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -48,13 +48,9 @@ SUBDIR_ORDERED= ${_csu} \ libsbuf \ libtacplus \ libutil \ - ${_libypclnt} - -.if ${MK_LIBCPLUSPLUS} != "no" -SUBDIR_ORDERED+=libcxxrt\ - libc++ -.endif - + ${_libypclnt} \ + ${_libcxxrt} \ + ${_libcplusplus} SUBDIR= ${SUBDIR_ORDERED} \ libalias \ @@ -209,6 +205,11 @@ _libsmb= libsmb _libmp= libmp .endif +.if ${MK_LIBCPLUSPLUS} != "no" +_libcxxrt= libcxxrt +_libcplusplus= libc++ +.endif + .if ${MK_PMC} != "no" _libpmc= libpmc .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 2d3617a..e0afdf4 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -413,6 +413,7 @@ __DEFAULT_NO_OPTIONS = \ HESIOD \ ICONV \ IDEA \ + LIBCPLUSPLUS \ OFED # @@ -553,8 +554,6 @@ MK_GCC:= no MK_GDB:= no .endif -MK_LIBCPLUSPLUS?= no - # # Set defaults for the MK_*_SUPPORT variables. # |
