diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-06 04:37:02 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-06 04:37:02 +0000 |
| commit | d72bb0e381ac340e9822b3b8a4a2d4a4f6df46f6 (patch) | |
| tree | f6ef70f7dd739d99171898ff7944f83d524e3f1e /mk/compiler/mipspro.mk | |
| parent | fd4c71ddde3378e0d549a90a5a311d8243a37f6e (diff) | |
| download | pkgsrc-d72bb0e381ac340e9822b3b8a4a2d4a4f6df46f6.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/compiler/mipspro.mk')
| -rw-r--r-- | mk/compiler/mipspro.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk index 0868c146c13..22d72b26c5e 100644 --- a/mk/compiler/mipspro.mk +++ b/mk/compiler/mipspro.mk @@ -1,4 +1,4 @@ -# $NetBSD: mipspro.mk,v 1.12 2004/02/06 03:04:50 jlam Exp $ +# $NetBSD: mipspro.mk,v 1.13 2004/02/06 04:37:02 jlam Exp $ .if !defined(COMPILER_MIPSPRO_MK) COMPILER_MIPSPRO_MK= one @@ -40,8 +40,7 @@ COMPILER_MIPSPRO_MK+= two # Prepend the path to the compiler to the PATH. . if !empty(_LANGUAGES.mipspro) -. if !empty(PHASES_AFTER_BUILDLINK:M${PKG_PHASE}) && \ - empty(PREPEND_PATH:M${MIPSPROBASE}/bin) +. if empty(PREPEND_PATH:M${MIPSPROBASE}/bin) PREPEND_PATH+= ${MIPSPROBASE}/bin PATH:= ${MIPSPROBASE}/bin:${PATH} . endif |