From 9d57e1df1f50d25c7f53b43d3f6e86fab51b43cb Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Sat, 8 May 2004 16:36:55 +0000
Subject: correctly preserve the user-specified order of pseudo-compilers.
 patch from jlam@.

---
 mk/compiler.mk | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'mk')

diff --git a/mk/compiler.mk b/mk/compiler.mk
index 4c42ba0f016..f1ed1999b83 100644
--- a/mk/compiler.mk
+++ b/mk/compiler.mk
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.29 2004/05/08 15:09:31 grant Exp $
+# $NetBSD: compiler.mk,v 1.30 2004/05/08 16:36:55 grant Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -132,15 +132,14 @@ _COMPILER=	${_compiler_}
 
 .if !defined(_COMPILER)
 PKG_FAIL_REASON+=	"No acceptable compiler found for ${PKGNAME}."
-.else
-_PKGSRC_COMPILER:=	${_COMPILER}
 .endif
 
-.for _compiler_ in ${_PSEUDO_COMPILERS}
-.  if !empty(PKGSRC_COMPILER:M${_compiler_})
-_PKGSRC_COMPILER:=	${_PKGSRC_COMPILER} ${_compiler_}
+.for _compiler_ in ${PKGSRC_COMPILER}
+.  if !empty(_PSEUDO_COMPILERS:M${_compiler_})
+_PKGSRC_COMPILER:=	${_compiler_} ${_PKGSRC_COMPILER}
 .  endif
 .endfor
+_PKGSRC_COMPILER:=	${_COMPILER} ${_PKGSRC_COMPILER}
 
 .for _compiler_ in ${_PKGSRC_COMPILER}
 .  include "../../mk/compiler/${_compiler_}.mk"
-- 
cgit v1.2.3