diff options
| author | ru <ru@FreeBSD.org> | 2006-03-21 08:59:36 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2006-03-21 08:59:36 +0000 |
| commit | 09fb328353552cb08b51c897930cc37c77b42c1c (patch) | |
| tree | 80443f1514be8bc8f72a236738e39d550e31e0d5 | |
| parent | 8aed544b7c14bea86f3946122ae71bb42d24cde2 (diff) | |
| download | FreeBSD-src-09fb328353552cb08b51c897930cc37c77b42c1c.zip FreeBSD-src-09fb328353552cb08b51c897930cc37c77b42c1c.tar.gz | |
Desupport the *_COLLECT2 no-op.
| -rw-r--r-- | gnu/usr.bin/cc/Makefile | 4 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile index b1aa973..7dfd3c3 100644 --- a/gnu/usr.bin/cc/Makefile +++ b/gnu/usr.bin/cc/Makefile @@ -13,9 +13,9 @@ SUBDIR+= cpp .if ${MK_CXX} != "no" SUBDIR+= cc1plus c++ c++filt -.if ${MK_COLLECT2} != "no" +#.if ${MK_COLLECT2} != "no" #SUBDIR+= collect2 -.endif +#.endif .endif .if ${MK_OBJC} != "no" diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 02e6dfa..a693735 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -209,7 +209,6 @@ WITHOUT_${var}= BLUETOOTH \ BOOT \ CALENDAR \ - COLLECT2 \ CPP \ CRYPT \ CVS \ @@ -296,7 +295,6 @@ WITH_IDEA= BLUETOOTH \ BOOT \ CALENDAR \ - COLLECT2 \ CPP \ CRYPT \ CVS \ @@ -403,10 +401,6 @@ MK_OPENSSH:= no MK_KERBEROS:= no .endif -.if ${MK_CXX} == "no" -MK_COLLECT2:= no -.endif - .if ${MK_IPX} == "no" MK_NCP:= no .endif |
