diff options
| author | Steve Wills <swills@FreeBSD.org> | 2018-02-06 14:13:35 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2018-02-06 14:13:35 +0000 |
| commit | cbee9380e1f5e103ab57253d1ddd2e57e52698db (patch) | |
| tree | d16120798a30e1fc2719738011b2abd3536af63a /ports-mgmt | |
| parent | a60e477e4c088f8791394c564d4f6e626b1ca49b (diff) | |
| download | ports-cbee9380e1f5e103ab57253d1ddd2e57e52698db.tar.gz ports-cbee9380e1f5e103ab57253d1ddd2e57e52698db.zip | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 7324e60eacee..f20f24c8309b 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -70,7 +70,7 @@ pre-everything:: .endif .undef INSTALLS_DEPENDS -.if !exists(${LOCALBASE}/sbin/pkg) +.if !exists(${LOCALBASE}/sbin/pkg) || !defined(CROSS_TOOLCHAIN) PKG_BIN= ${WRKSRC}/src/pkg-static .endif diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 89c71ac4f4e6..ab074b3df725 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -70,7 +70,12 @@ pre-everything:: #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= .undef INSTALLS_DEPENDS + +# Use the internal pkg instead, generally, unless this is a cross-build, +# in which case that won't work. Hope for the best then. +.if !defined(CROSS_TOOLCHAIN) PKG_BIN= ${WRKSRC}/src/pkg-static +.endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} |