diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2011-11-26 03:26:06 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2011-11-26 03:26:06 +0000 |
| commit | 49c8e5e77e93307af187f91a0c452b2f5d1ca53f (patch) | |
| tree | 44b0bc4589c05e0ceaf7f09d403e39b5b539bc1f /Makefile.inc1 | |
| parent | 66761af34fd6ef72a99fc03e5129ae149305d87c (diff) | |
| download | src-test2-49c8e5e77e93307af187f91a0c452b2f5d1ca53f.tar.gz src-test2-49c8e5e77e93307af187f91a0c452b2f5d1ca53f.zip | |
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
Notes
Notes:
svn path=/head/; revision=227987
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 5c9cafa6f50d..c9534197a0f4 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 |