diff options
| author | jlam <jlam> | 2004-02-06 04:37:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-06 04:37:02 +0000 |
| commit | 59eb21ba1124fceff86c7afb4257da4ccc2937c2 (patch) | |
| tree | f6ef70f7dd739d99171898ff7944f83d524e3f1e /mk/buildlink2 | |
| parent | 025f76788eaf5394742f50cd9b0f22cbe2d56d5f (diff) | |
| download | pkgsrc-59eb21ba1124fceff86c7afb4257da4ccc2937c2.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/buildlink2')
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index fe3175c49d7..8aba55b7bf1 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.111 2004/02/06 03:04:50 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.112 2004/02/06 04:37:02 jlam Exp $ # # An example package buildlink2.mk file: # @@ -125,8 +125,7 @@ LDFLAGS+= ${FLAG} # Prepend ${BUILDLINK_DIR}/bin to the PATH so that the wrappers are found # first when searching for executables. # -.if !empty(PHASES_AFTER_BUILDLINK:M${PKG_PHASE}) && \ - empty(PREPEND_PATH:M${BUILDLINK_DIR}/bin) +.if empty(PREPEND_PATH:M${BUILDLINK_DIR}/bin) PREPEND_PATH+= ${BUILDLINK_DIR}/bin PATH:= ${BUILDLINK_DIR}/bin:${PATH} .endif |