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 /lib/Makefile | |
| 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
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
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 |
