diff options
| author | tnn <tnn@pkgsrc.org> | 2008-06-22 16:25:32 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2008-06-22 16:25:32 +0000 |
| commit | b41681c4463f60293daf45b3a03e0fc37391a5d6 (patch) | |
| tree | 2740e7e53f9c39af64abef0a3120f2d19418619a /mk | |
| parent | f66b4089d349c997dda5cf634af46ae64c47f8b2 (diff) | |
| download | pkgsrc-b41681c4463f60293daf45b3a03e0fc37391a5d6.tar.gz | |
Simplify the logic that avoids using compat_headers during bootstrap.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 99ce3478b3a..a75f6fd016f 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.285 2008/06/16 15:10:48 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.286 2008/06/22 16:25:32 tnn Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -510,10 +510,7 @@ USE_XPKGWEDGE?= yes .endif .if defined(FIX_SYSTEM_HEADERS) && ${FIX_SYSTEM_HEADERS} == "yes" && \ - empty(PKGPATH:Mpkgtools/*) && empty(PKGPATH:M*/nbsed) && \ - empty(PKGPATH:M*/nawk) && empty(PKGPATH:M*/bmake) && \ - empty(PKGPATH:M*/install-sh) && empty(PKGPATH:M*/tnftp) && \ - empty(PKGPATH:M*/pax) && \ + !defined(BOOTSTRAP_PKG) && \ exists(../../pkgtools/compat_headers/buildlink3.mk) . include "../../pkgtools/compat_headers/buildlink3.mk" .endif |