diff options
| author | riastradh <riastradh@pkgsrc.org> | 2013-05-10 00:49:00 +0000 |
|---|---|---|
| committer | riastradh <riastradh@pkgsrc.org> | 2013-05-10 00:49:00 +0000 |
| commit | 07bbe8cd345f37c3d45c067e61009dd907655a21 (patch) | |
| tree | 2baca6fe33d8e7c2389d4dd06b027686adcfadda /pkgtools/pkg_install | |
| parent | 1fa7ba38f5d100eb7c49a6684a36b183fafab072 (diff) | |
| download | pkgsrc-07bbe8cd345f37c3d45c067e61009dd907655a21.tar.gz | |
Fix cross-build of pkgtools/pkg_install.
Can't execute the newly built tools if they were cross-built.
(This is not especially useful until we do cross-bootstrap, though.)
ok agc
Diffstat (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index c5066b37369..9da7fdbf4ad 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.194 2013/04/08 11:17:20 rodent Exp $ +# $NetBSD: Makefile,v 1.195 2013/05/10 00:49:00 riastradh Exp $ # Notes to package maintainers: # @@ -42,7 +42,10 @@ CHECK_PERMS= no # pkg_install. # # We also use the newly built pkg_{add,create,delete} since upgrading -# from an older pkg_install might required features of the new program. +# from an older pkg_install might required features of the new +# program, provided that we are not cross-compiling. (XXX If we are +# cross-compiling, we should maybe have a host build dependency on +# ourselves...) # # Note that the definitions are only overriden for the phases that are # supposed to use them. pkg_admin pmatch might be used when looking for @@ -50,7 +53,7 @@ CHECK_PERMS= no # be rethought. USE_NATIVE_GCC= yes -.if defined(_PKGSRC_BARRIER) +.if defined(_PKGSRC_BARRIER) && empty(USE_CROSS_COMPILE:M[yY][eE][sS]) PKG_ADD_CMD= ${WRKSRC}/add/pkg_add PKG_CREATE_CMD= ${WRKSRC}/create/pkg_create PKG_DELETE_CMD= ${WRKSRC}/delete/pkg_delete |