diff options
| author | jlam <jlam> | 2004-02-06 04:37:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-06 04:37:02 +0000 |
| commit | 6528746dd2155a28ca2f43a2b964be3504eebee4 (patch) | |
| tree | f6ef70f7dd739d99171898ff7944f83d524e3f1e /mk/tools.mk | |
| parent | 0fa4bcaebd68293da3dcd6cc05f746a4bdf04e05 (diff) | |
| download | pkgsrc-6528746dd2155a28ca2f43a2b964be3504eebee4.tar.gz | |
Hiding the PATH from certain phases of the build only accidentally worked
due to a type on gcc.mk that causes the ${_GCC_PREFIX}/bin to always be
prepended to the PATH. The problem that was hiding was "make" resolving
to ${TOOLS_DIR}/bin/make if the package used GNU make, which broke
building since the package Makefile is a BSD Makefile and we passed
PATH to some phases of the build. Fix this by expanding MAKE to the
full path to ${MAKE} in bsd.prefs.mk. We also garbage collect the now
useless checks for PHASES_AFTER_BUILDLINK that cluttered the PREPEND_PATH
code.
Diffstat (limited to 'mk/tools.mk')
| -rw-r--r-- | mk/tools.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/tools.mk b/mk/tools.mk index 483ad3a7b0b..357dec7547f 100644 --- a/mk/tools.mk +++ b/mk/tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.mk,v 1.24 2004/02/06 03:04:50 jlam Exp $ +# $NetBSD: tools.mk,v 1.25 2004/02/06 04:37:02 jlam Exp $ # # This Makefile creates a ${TOOLS_DIR} directory and populates the bin # subdir with tools that hide the ones outside of ${TOOLS_DIR}. @@ -12,8 +12,7 @@ TOOLS_MK= # defined # first when searching for executables. # TOOLS_DIR= ${WRKDIR}/.tools -.if !empty(PHASES_AFTER_BUILDLINK:M${PKG_PHASE}) && \ - empty(PREPEND_PATH:M${TOOLS_DIR}/bin) +.if empty(PREPEND_PATH:M${TOOLS_DIR}/bin) PREPEND_PATH+= ${TOOLS_DIR}/bin PATH:= ${TOOLS_DIR}/bin:${PATH} .endif |