Thu Aug 9 12:32:41 2012 UTC ()
_LINKER_ABI_FLAG.* is not set anywhere in pkgsrc, remove to avoid confusion.


(jperkin)
diff -r1.78 -r1.79 pkgsrc/mk/compiler.mk
cvs diff -r1.78 -r1.79 pkgsrc/mk/compiler.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler.mk 2012/08/09 12:16:24 1.78
+++ pkgsrc/mk/compiler.mk 2012/08/09 12:32:41 1.79
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: compiler.mk,v 1.78 2012/08/09 12:16:24 jperkin Exp $ 1# $NetBSD: compiler.mk,v 1.79 2012/08/09 12:32:41 jperkin Exp $
2# 2#
3# This Makefile fragment implements handling for supported C/C++/Fortran 3# This Makefile fragment implements handling for supported C/C++/Fortran
4# compilers. 4# compilers.
5# 5#
6# The following variables may be set by the pkgsrc user in mk.conf: 6# The following variables may be set by the pkgsrc user in mk.conf:
7# 7#
8# PKGSRC_COMPILER 8# PKGSRC_COMPILER
9# A list of values specifying the chain of compilers to be used by 9# A list of values specifying the chain of compilers to be used by
10# pkgsrc to build packages. 10# pkgsrc to build packages.
11# 11#
12# Valid values are: 12# Valid values are:
13# ccc Compaq C Compilers (Tru64) 13# ccc Compaq C Compilers (Tru64)
14# ccache compiler cache (chainable) 14# ccache compiler cache (chainable)
@@ -145,27 +145,26 @@ PKG_LD?= /usr/bin/ld @@ -145,27 +145,26 @@ PKG_LD?= /usr/bin/ld
145# 145#
146.for _var_ in ${_COMPILER_STRIP_VARS} 146.for _var_ in ${_COMPILER_STRIP_VARS}
147. if empty(${_var_}:C/^/_asdf_/1:N_asdf_*) 147. if empty(${_var_}:C/^/_asdf_/1:N_asdf_*)
148${_var_}:= ${${_var_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//:T} 148${_var_}:= ${${_var_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//:T}
149. else 149. else
150${_var_}:= ${${_var_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//:T} ${${_var_}:C/^/_asdf_/1:N_asdf_*} 150${_var_}:= ${${_var_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//:T} ${${_var_}:C/^/_asdf_/1:N_asdf_*}
151. endif 151. endif
152.endfor 152.endfor
153 153
154.if defined(ABI) && !empty(ABI) 154.if defined(ABI) && !empty(ABI)
155_WRAP_EXTRA_ARGS.CC+= ${_COMPILER_ABI_FLAG.${ABI}} 155_WRAP_EXTRA_ARGS.CC+= ${_COMPILER_ABI_FLAG.${ABI}}
156_WRAP_EXTRA_ARGS.CXX+= ${_COMPILER_ABI_FLAG.${ABI}} 156_WRAP_EXTRA_ARGS.CXX+= ${_COMPILER_ABI_FLAG.${ABI}}
157_WRAP_EXTRA_ARGS.FC+= ${_COMPILER_ABI_FLAG.${ABI}} 157_WRAP_EXTRA_ARGS.FC+= ${_COMPILER_ABI_FLAG.${ABI}}
158_WRAP_EXTRA_ARGS.LD+= ${_LINKER_ABI_FLAG.${ABI}} 
159.endif 158.endif
160 159
161# If the languages are not requested, force them not to be available 160# If the languages are not requested, force them not to be available
162# in the generated wrappers. 161# in the generated wrappers.
163# 162#
164_FAIL_WRAPPER.CC= ${WRKDIR}/.compiler/bin/c-fail-wrapper 163_FAIL_WRAPPER.CC= ${WRKDIR}/.compiler/bin/c-fail-wrapper
165_FAIL_WRAPPER.CXX= ${WRKDIR}/.compiler/bin/c++-fail-wrapper 164_FAIL_WRAPPER.CXX= ${WRKDIR}/.compiler/bin/c++-fail-wrapper
166_FAIL_WRAPPER.FC= ${WRKDIR}/.compiler/bin/fortran-fail-wrapper 165_FAIL_WRAPPER.FC= ${WRKDIR}/.compiler/bin/fortran-fail-wrapper
167_FAIL_WRAPPER.ADA= ${WRKDIR}/.compiler/bin/ada-fail-wrapper 166_FAIL_WRAPPER.ADA= ${WRKDIR}/.compiler/bin/ada-fail-wrapper
168 167
169${_FAIL_WRAPPER.CC}: fail-wrapper 168${_FAIL_WRAPPER.CC}: fail-wrapper
170${_FAIL_WRAPPER.CXX}: fail-wrapper 169${_FAIL_WRAPPER.CXX}: fail-wrapper
171${_FAIL_WRAPPER.FC}: fail-wrapper 170${_FAIL_WRAPPER.FC}: fail-wrapper