diff options
author | riastradh <riastradh@pkgsrc.org> | 2019-07-09 15:45:25 +0000 |
---|---|---|
committer | riastradh <riastradh@pkgsrc.org> | 2019-07-09 15:45:25 +0000 |
commit | 2b1084b7fa61ed6ce99dd2a064b581098b176459 (patch) | |
tree | bbdad8e97776be26ad7b46f3a9b0d140b7b509ba /mk | |
parent | b8576ff54b5b195c9cfb693ab85bafd5dab8d658 (diff) | |
download | pkgsrc-2b1084b7fa61ed6ce99dd2a064b581098b176459.tar.gz |
Sync cross-libtool-base with libtool-base. Eliminate CROSSBASE.
cross-libtool-base now installs into $PREFIX/cross-$TARGET_ARCH
unconditionally.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.use.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index cbaae33e466..56d0348e226 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.67 2018/01/02 05:49:44 maya Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.68 2019/07/09 15:45:25 riastradh Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -86,8 +86,8 @@ BUILD_DEPENDS+= libtool-fortran>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../ . endif .else . if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) -PKG_LIBTOOL?= ${CROSSBASE}/bin/libtool -PKG_SHLIBTOOL?= ${CROSSBASE}/bin/shlibtool +PKG_LIBTOOL?= ${LOCALBASE}/cross-${TARGET_ARCH:U${MACHINE_ARCH}}/bin/libtool +PKG_SHLIBTOOL?= ${LOCALBASE}/cross-${TARGET_ARCH:U${MACHINE_ARCH}}/bin/shlibtool . else PKG_LIBTOOL?= ${LOCALBASE}/bin/libtool PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool |