Drop _LIBTOOL and _SHLIBTOOL and make LIBTOOL and SHLIBTOOL point to the

wrapped version by full path. This fixes some cases where the wrappers
have been bypassed. lang/lua52 triggered the investigation as it failed
to link against libreadline, which should have been translated to
libedit. Tested by jperkin and myself with full bulk builds.

4 files changed, 9 insertions, 19 deletions

diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index c0e44554075..19cbdb74b2f 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.58 2014/12/30 15:13:19 wiz Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.59 2015/05/04 19:23:19 joerg Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -80,10 +80,8 @@ BUILD_DEFS+=		KERBEROS
 
 #
 # PKG_LIBTOOL is the path to the libtool script installed by libtool-base.
-# _LIBTOOL is the path the libtool used by the build, which could be the
-#	path to a libtool wrapper script.
 # LIBTOOL is the publicly-readable variable that should be used by
-#	Makefiles to invoke the proper libtool.
+#	Makefiles to invoke the proper (wrapped) libtool.
 #
 .if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran) || \
     defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran77)
@@ -106,10 +104,8 @@ PKG_LIBTOOL?=		${LOCALBASE}/bin/libtool
 PKG_SHLIBTOOL?=		${LOCALBASE}/bin/shlibtool
 .  endif
 .endif
-_LIBTOOL?=		${PKG_LIBTOOL}
-_SHLIBTOOL?=		${PKG_SHLIBTOOL}
-LIBTOOL?=		${PKG_LIBTOOL}
-SHLIBTOOL?=		${PKG_SHLIBTOOL}
+LIBTOOL?=		${WRAPPER_BINDIR}/libtool
+SHLIBTOOL?=		${WRAPPER_BINDIR}/shlibtool
 .if defined(USE_LIBTOOL)
 LIBTOOL_REQD?=		2.2.6bnb3
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index fc0279d4e7f..0cbf2facc57 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.235 2015/04/27 19:38:03 jperkin Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.236 2015/05/04 19:23:19 joerg Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1069,8 +1069,6 @@ WRAPPER_TRANSFORM_CMDS+=	${_BLNK_TRANSFORM}
 .if defined(USE_LIBTOOL)
 WRAPPEES+=		LIBTOOL
 WRAPPEES+=		SHLIBTOOL
-_LIBTOOL=		${WRAPPER_LIBTOOL}
-_SHLIBTOOL=		${WRAPPER_SHLIBTOOL}
 .endif
 _WRAP_ALIASES.LIBTOOL=		libtool
 _WRAP_ALIASES.SHLIBTOOL=	shlibtool
diff --git a/mk/configure/libtool-override.mk b/mk/configure/libtool-override.mk
index 5519d7f0246..259fdd8e30a 100644
--- a/mk/configure/libtool-override.mk
+++ b/mk/configure/libtool-override.mk
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-override.mk,v 1.10 2008/02/07 21:36:13 rillig Exp $
+# $NetBSD: libtool-override.mk,v 1.11 2015/05/04 19:23:19 joerg Exp $
 
 ######################################################################
 ### {libtool,shlibtool}-override (PRIVATE)
@@ -14,8 +14,8 @@ do-configure-post-hook: shlibtool-override
 OVERRIDE_DIRDEPTH.libtool?=	${OVERRIDE_DIRDEPTH}
 OVERRIDE_DIRDEPTH.shlibtool?=	${OVERRIDE_DIRDEPTH}
 
-_OVERRIDE_PATH.libtool=		${_LIBTOOL}
-_OVERRIDE_PATH.shlibtool=	${_SHLIBTOOL}
+_OVERRIDE_PATH.libtool=		${LIBTOOL}
+_OVERRIDE_PATH.shlibtool=	${SHLIBTOOL}
 
 .for _script_ in libtool shlibtool
 _SCRIPT.${_script_}-override=						\
diff --git a/mk/cwrappers.mk b/mk/cwrappers.mk
index 8f8a0c259eb..6c4e1ee8c4b 100644
--- a/mk/cwrappers.mk
+++ b/mk/cwrappers.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cwrappers.mk,v 1.25 2015/04/28 21:15:01 jperkin Exp $
+# $NetBSD: cwrappers.mk,v 1.26 2015/05/04 19:23:19 joerg Exp $
 #
 # This Makefile fragment implements integration of pkgtools/cwrappers.
 
@@ -87,10 +87,6 @@ generate-cwrappers:
 .  endfor
 .endfor
 
-.if defined(USE_LIBTOOL)
-_LIBTOOL=		${WRAPPER_BINDIR}/libtool
-_SHLIBTOOL=		${WRAPPER_BINDIR}/shlibtool
-.endif
 PREPEND_PATH+=		${WRAPPER_BINDIR}
 
 _COOKIE.wrapper=	${WRKDIR}/.wrapper_done