pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk correctly preserve the user-specified order of pseu...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/caa6b54147aa
branches:  trunk
changeset: 474995:caa6b54147aa
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat May 08 16:36:55 2004 +0000

description:
correctly preserve the user-specified order of pseudo-compilers. patch
from jlam@.

diffstat:

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

diffs (29 lines):

diff -r f905b5e03764 -r caa6b54147aa mk/compiler.mk
--- a/mk/compiler.mk    Sat May 08 16:14:55 2004 +0000
+++ b/mk/compiler.mk    Sat May 08 16:36:55 2004 +0000
@@ -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 @@
 
 .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"



Home | Main Index | Thread Index | Old Index