Wed Feb 4 14:13:30 2015 UTC ()
Support the as override specs for cwrappers too.


(jperkin)
diff -r1.7 -r1.8 pkgsrc/devel/binutils/override-as.mk
cvs diff -r1.7 -r1.8 pkgsrc/devel/binutils/override-as.mk (expand / switch to unified diff)

--- pkgsrc/devel/binutils/override-as.mk 2013/08/15 06:48:50 1.7
+++ pkgsrc/devel/binutils/override-as.mk 2015/02/04 14:13:29 1.8
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1# $NetBSD: override-as.mk,v 1.7 2013/08/15 06:48:50 richard Exp $ 1# $NetBSD: override-as.mk,v 1.8 2015/02/04 14:13:29 jperkin Exp $
2 2
3# This Makefile fragment can be included by packages that wish to 3# This Makefile fragment can be included by packages that wish to
4# override the default selection of as(1) and use the one from devel/binutils 4# override the default selection of as(1) and use the one from devel/binutils
5# instead. 5# instead.
6 6
7PKG_AS= ${PREFIX}/bin/gas 7PKG_AS= ${PREFIX}/bin/gas
8 8
9.include "../../mk/compiler.mk" 9.include "../../mk/compiler.mk"
10 10
11.if !empty(PKGSRC_COMPILER:Mgcc) 11.if !empty(PKGSRC_COMPILER:Mgcc)
12 12
13SPECS_AS= ${WRAPPER_DIR}/specs.as 13SPECS_AS= ${WRAPPER_DIR}/specs.as
14WRAPPER_TARGETS+= ${SPECS_AS} 14WRAPPER_TARGETS+= ${SPECS_AS}
15 15
16${SPECS_AS}: 16${SPECS_AS}:
17 @${ECHO} "*invoke_as:" > ${SPECS_AS} 17 @${ECHO} "*invoke_as:" > ${SPECS_AS}
18 @${ECHO} "%{!S:-o %|.s |" >> ${SPECS_AS} 18 @${ECHO} "%{!S:-o %|.s |" >> ${SPECS_AS}
19 @${ECHO} "${PKG_AS} %(asm_options) %m.s %A }" >> ${SPECS_AS} 19 @${ECHO} "${PKG_AS} %(asm_options) %m.s %A }" >> ${SPECS_AS}
20 20
21_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_AS} 21_WRAP_EXTRA_ARGS.CC+= -specs=${SPECS_AS}
22_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_AS} 22_WRAP_EXTRA_ARGS.CXX+= -specs=${SPECS_AS}
 23CWRAPPERS_APPEND.cc+= -specs=${SPECS_AS}
 24CWRAPPERS_APPEND.cxx+= -specs=${SPECS_AS}
23 25
24.endif 26.endif