Re: svn commit: r335733 - in head: bin/csh gnu/usr.bin/cc/cc1 gnu/usr.bin/cc/cc1plus gnu/usr.bin/cc/cc_tools lib/libmagic lib/libpam/static_libpam lib/ncurses/ncurses share/syscons/scrnmaps stand/mips

2018-06-27 Thread Bryan Drewery
On 6/27/2018 4:05 PM, Dimitry Andric wrote:
> On 27 Jun 2018, at 22:53, John Baldwin  wrote:
>>
>> On 6/27/18 12:45 PM, Bryan Drewery wrote:
>>> On 6/27/2018 12:35 PM, Dimitry Andric wrote:
 On 27 Jun 2018, at 21:29, Bryan Drewery  wrote:
>
> Author: bdrewery
> Date: Wed Jun 27 19:29:15 2018
> New Revision: 335733
> URL: https://svnweb.freebsd.org/changeset/base/335733
>
> Log:
> Don't use CCACHE for linking.
>
> MFC after:2 weeks
> Sponsored by: Dell EMC
>
> Modified:
> head/bin/csh/Makefile
> head/gnu/usr.bin/cc/cc1/Makefile
> head/gnu/usr.bin/cc/cc1plus/Makefile
> head/gnu/usr.bin/cc/cc_tools/Makefile
> head/lib/libmagic/Makefile
> head/lib/libpam/static_libpam/Makefile
> head/lib/ncurses/ncurses/Makefile
> head/share/syscons/scrnmaps/Makefile
> head/stand/mips/beri/boot2/Makefile
> head/usr.bin/vi/catalog/Makefile
>
> Modified: head/bin/csh/Makefile
> ==
> --- head/bin/csh/Makefile Wed Jun 27 19:28:37 2018(r335732)
> +++ head/bin/csh/Makefile Wed Jun 27 19:29:15 2018(r335733)
> @@ -113,7 +113,7 @@ build-tools: gethost
>
> gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META}
>   @rm -f ${.TARGET}
> - ${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
> + ${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
>   ${TCSHDIR}/gethost.c

 Looks like a good candidate for a common macro, say CC_NOCACHE, CC_REAL
 or something like that? :)
>>>
>>> Yeah probably. I'd paint it CC_LINK.
>>
>> CCLD was my initial thought *duck*
> 
> Actually, that is not bad, and something I have seem more often.  In the
> sense that ${LD} would be e.g. /usr/bin/ld or at least, a "low level"
> linker, while ${CCLD} would be the compiler driver doing the work.
> Maybe it is specifically for these cases, that you don't directly use
> ${CC}, but ${CCLD}...
> 

+1


-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature


Re: svn commit: r335733 - in head: bin/csh gnu/usr.bin/cc/cc1 gnu/usr.bin/cc/cc1plus gnu/usr.bin/cc/cc_tools lib/libmagic lib/libpam/static_libpam lib/ncurses/ncurses share/syscons/scrnmaps stand/mips

2018-06-27 Thread Dimitry Andric
On 27 Jun 2018, at 22:53, John Baldwin  wrote:
> 
> On 6/27/18 12:45 PM, Bryan Drewery wrote:
>> On 6/27/2018 12:35 PM, Dimitry Andric wrote:
>>> On 27 Jun 2018, at 21:29, Bryan Drewery  wrote:
 
 Author: bdrewery
 Date: Wed Jun 27 19:29:15 2018
 New Revision: 335733
 URL: https://svnweb.freebsd.org/changeset/base/335733
 
 Log:
 Don't use CCACHE for linking.
 
 MFC after: 2 weeks
 Sponsored by:  Dell EMC
 
 Modified:
 head/bin/csh/Makefile
 head/gnu/usr.bin/cc/cc1/Makefile
 head/gnu/usr.bin/cc/cc1plus/Makefile
 head/gnu/usr.bin/cc/cc_tools/Makefile
 head/lib/libmagic/Makefile
 head/lib/libpam/static_libpam/Makefile
 head/lib/ncurses/ncurses/Makefile
 head/share/syscons/scrnmaps/Makefile
 head/stand/mips/beri/boot2/Makefile
 head/usr.bin/vi/catalog/Makefile
 
 Modified: head/bin/csh/Makefile
 ==
 --- head/bin/csh/Makefile  Wed Jun 27 19:28:37 2018(r335732)
 +++ head/bin/csh/Makefile  Wed Jun 27 19:29:15 2018(r335733)
 @@ -113,7 +113,7 @@ build-tools: gethost
 
 gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META}
@rm -f ${.TARGET}
 -  ${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
 +  ${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
${TCSHDIR}/gethost.c
>>> 
>>> Looks like a good candidate for a common macro, say CC_NOCACHE, CC_REAL
>>> or something like that? :)
>> 
>> Yeah probably. I'd paint it CC_LINK.
> 
> CCLD was my initial thought *duck*

Actually, that is not bad, and something I have seem more often.  In the
sense that ${LD} would be e.g. /usr/bin/ld or at least, a "low level"
linker, while ${CCLD} would be the compiler driver doing the work.
Maybe it is specifically for these cases, that you don't directly use
${CC}, but ${CCLD}...

-Dimitry



signature.asc
Description: Message signed with OpenPGP


Re: svn commit: r335733 - in head: bin/csh gnu/usr.bin/cc/cc1 gnu/usr.bin/cc/cc1plus gnu/usr.bin/cc/cc_tools lib/libmagic lib/libpam/static_libpam lib/ncurses/ncurses share/syscons/scrnmaps stand/mips

2018-06-27 Thread John Baldwin
On 6/27/18 12:45 PM, Bryan Drewery wrote:
> On 6/27/2018 12:35 PM, Dimitry Andric wrote:
>> On 27 Jun 2018, at 21:29, Bryan Drewery  wrote:
>>>
>>> Author: bdrewery
>>> Date: Wed Jun 27 19:29:15 2018
>>> New Revision: 335733
>>> URL: https://svnweb.freebsd.org/changeset/base/335733
>>>
>>> Log:
>>>  Don't use CCACHE for linking.
>>>
>>>  MFC after: 2 weeks
>>>  Sponsored by:  Dell EMC
>>>
>>> Modified:
>>>  head/bin/csh/Makefile
>>>  head/gnu/usr.bin/cc/cc1/Makefile
>>>  head/gnu/usr.bin/cc/cc1plus/Makefile
>>>  head/gnu/usr.bin/cc/cc_tools/Makefile
>>>  head/lib/libmagic/Makefile
>>>  head/lib/libpam/static_libpam/Makefile
>>>  head/lib/ncurses/ncurses/Makefile
>>>  head/share/syscons/scrnmaps/Makefile
>>>  head/stand/mips/beri/boot2/Makefile
>>>  head/usr.bin/vi/catalog/Makefile
>>>
>>> Modified: head/bin/csh/Makefile
>>> ==
>>> --- head/bin/csh/Makefile   Wed Jun 27 19:28:37 2018(r335732)
>>> +++ head/bin/csh/Makefile   Wed Jun 27 19:29:15 2018(r335733)
>>> @@ -113,7 +113,7 @@ build-tools: gethost
>>>
>>> gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META}
>>> @rm -f ${.TARGET}
>>> -   ${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
>>> +   ${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
>>> ${TCSHDIR}/gethost.c
>>
>> Looks like a good candidate for a common macro, say CC_NOCACHE, CC_REAL
>> or something like that? :)
> 
> Yeah probably. I'd paint it CC_LINK.

CCLD was my initial thought *duck*

-- 
John Baldwin
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


Re: svn commit: r335733 - in head: bin/csh gnu/usr.bin/cc/cc1 gnu/usr.bin/cc/cc1plus gnu/usr.bin/cc/cc_tools lib/libmagic lib/libpam/static_libpam lib/ncurses/ncurses share/syscons/scrnmaps stand/mips

2018-06-27 Thread Bryan Drewery
On 6/27/2018 12:35 PM, Dimitry Andric wrote:
> On 27 Jun 2018, at 21:29, Bryan Drewery  wrote:
>>
>> Author: bdrewery
>> Date: Wed Jun 27 19:29:15 2018
>> New Revision: 335733
>> URL: https://svnweb.freebsd.org/changeset/base/335733
>>
>> Log:
>>  Don't use CCACHE for linking.
>>
>>  MFC after:  2 weeks
>>  Sponsored by:   Dell EMC
>>
>> Modified:
>>  head/bin/csh/Makefile
>>  head/gnu/usr.bin/cc/cc1/Makefile
>>  head/gnu/usr.bin/cc/cc1plus/Makefile
>>  head/gnu/usr.bin/cc/cc_tools/Makefile
>>  head/lib/libmagic/Makefile
>>  head/lib/libpam/static_libpam/Makefile
>>  head/lib/ncurses/ncurses/Makefile
>>  head/share/syscons/scrnmaps/Makefile
>>  head/stand/mips/beri/boot2/Makefile
>>  head/usr.bin/vi/catalog/Makefile
>>
>> Modified: head/bin/csh/Makefile
>> ==
>> --- head/bin/csh/MakefileWed Jun 27 19:28:37 2018(r335732)
>> +++ head/bin/csh/MakefileWed Jun 27 19:29:15 2018(r335733)
>> @@ -113,7 +113,7 @@ build-tools: gethost
>>
>> gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META}
>>  @rm -f ${.TARGET}
>> -${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
>> +${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
>>  ${TCSHDIR}/gethost.c
> 
> Looks like a good candidate for a common macro, say CC_NOCACHE, CC_REAL
> or something like that? :)

Yeah probably. I'd paint it CC_LINK.

-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature


Re: svn commit: r335733 - in head: bin/csh gnu/usr.bin/cc/cc1 gnu/usr.bin/cc/cc1plus gnu/usr.bin/cc/cc_tools lib/libmagic lib/libpam/static_libpam lib/ncurses/ncurses share/syscons/scrnmaps stand/mips

2018-06-27 Thread Dimitry Andric
On 27 Jun 2018, at 21:29, Bryan Drewery  wrote:
> 
> Author: bdrewery
> Date: Wed Jun 27 19:29:15 2018
> New Revision: 335733
> URL: https://svnweb.freebsd.org/changeset/base/335733
> 
> Log:
>  Don't use CCACHE for linking.
> 
>  MFC after:   2 weeks
>  Sponsored by:Dell EMC
> 
> Modified:
>  head/bin/csh/Makefile
>  head/gnu/usr.bin/cc/cc1/Makefile
>  head/gnu/usr.bin/cc/cc1plus/Makefile
>  head/gnu/usr.bin/cc/cc_tools/Makefile
>  head/lib/libmagic/Makefile
>  head/lib/libpam/static_libpam/Makefile
>  head/lib/ncurses/ncurses/Makefile
>  head/share/syscons/scrnmaps/Makefile
>  head/stand/mips/beri/boot2/Makefile
>  head/usr.bin/vi/catalog/Makefile
> 
> Modified: head/bin/csh/Makefile
> ==
> --- head/bin/csh/Makefile Wed Jun 27 19:28:37 2018(r335732)
> +++ head/bin/csh/Makefile Wed Jun 27 19:29:15 2018(r335733)
> @@ -113,7 +113,7 @@ build-tools: gethost
> 
> gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META}
>   @rm -f ${.TARGET}
> - ${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
> + ${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
>   ${TCSHDIR}/gethost.c

Looks like a good candidate for a common macro, say CC_NOCACHE, CC_REAL
or something like that? :)

-Dimitry



signature.asc
Description: Message signed with OpenPGP


svn commit: r335733 - in head: bin/csh gnu/usr.bin/cc/cc1 gnu/usr.bin/cc/cc1plus gnu/usr.bin/cc/cc_tools lib/libmagic lib/libpam/static_libpam lib/ncurses/ncurses share/syscons/scrnmaps stand/mips/...

2018-06-27 Thread Bryan Drewery
Author: bdrewery
Date: Wed Jun 27 19:29:15 2018
New Revision: 335733
URL: https://svnweb.freebsd.org/changeset/base/335733

Log:
  Don't use CCACHE for linking.
  
  MFC after:2 weeks
  Sponsored by: Dell EMC

Modified:
  head/bin/csh/Makefile
  head/gnu/usr.bin/cc/cc1/Makefile
  head/gnu/usr.bin/cc/cc1plus/Makefile
  head/gnu/usr.bin/cc/cc_tools/Makefile
  head/lib/libmagic/Makefile
  head/lib/libpam/static_libpam/Makefile
  head/lib/ncurses/ncurses/Makefile
  head/share/syscons/scrnmaps/Makefile
  head/stand/mips/beri/boot2/Makefile
  head/usr.bin/vi/catalog/Makefile

Modified: head/bin/csh/Makefile
==
--- head/bin/csh/Makefile   Wed Jun 27 19:28:37 2018(r335732)
+++ head/bin/csh/Makefile   Wed Jun 27 19:29:15 2018(r335733)
@@ -113,7 +113,7 @@ build-tools: gethost
 
 gethost: gethost.c sh.err.h tc.const.h sh.h ${BUILD_TOOLS_META}
@rm -f ${.TARGET}
-   ${CC} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
+   ${CC:N${CCACHE_BIN}} -o gethost ${LDFLAGS} ${CFLAGS:C/-DHAVE_ICONV//} \
${TCSHDIR}/gethost.c
 
 tc.defs.c: gethost ${TCSHDIR}/host.defs

Modified: head/gnu/usr.bin/cc/cc1/Makefile
==
--- head/gnu/usr.bin/cc/cc1/MakefileWed Jun 27 19:28:37 2018
(r335732)
+++ head/gnu/usr.bin/cc/cc1/MakefileWed Jun 27 19:29:15 2018
(r335733)
@@ -20,7 +20,7 @@ LDADD=${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIB
 
 DOBJS+=${SRCS:N*.h:R:S/$/.o/g}
 ${PROG}-dummy: ${DOBJS}
-   ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
+   ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} 
${LDADD}
 CLEANFILES+=   ${PROG}-dummy
 
 ${PROG}-checksum.c:${PROG}-dummy

Modified: head/gnu/usr.bin/cc/cc1plus/Makefile
==
--- head/gnu/usr.bin/cc/cc1plus/MakefileWed Jun 27 19:28:37 2018
(r335732)
+++ head/gnu/usr.bin/cc/cc1plus/MakefileWed Jun 27 19:29:15 2018
(r335733)
@@ -35,7 +35,7 @@ CLEANFILES= cfns.h
 
 DOBJS+=${SRCS:N*.h:R:S/$/.o/g}
 ${PROG}-dummy: ${DOBJS}
-   ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
+   ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} 
${LDADD}
 CLEANFILES+=   ${PROG}-dummy
 
 ${PROG}-checksum.c:${PROG}-dummy

Modified: head/gnu/usr.bin/cc/cc_tools/Makefile
==
--- head/gnu/usr.bin/cc/cc_tools/Makefile   Wed Jun 27 19:28:37 2018
(r335732)
+++ head/gnu/usr.bin/cc/cc_tools/Makefile   Wed Jun 27 19:29:15 2018
(r335733)
@@ -276,7 +276,7 @@ CLEANFILES+= gengtype-yacc.c
 
 gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o errors.o \
  ${LIBIBERTY}
-   ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+   ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 gtype-desc.h:  gengtype
${BTOOLSPATH:U.}/gengtype
@@ -292,18 +292,18 @@ CLEANFILES+=  gt-*.h gtype-*.h
 #
 .for F in check checksum genrtl modes
 gen$F: gen$F.o errors.o ${LIBIBERTY}
-   ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+   ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 .endfor
 
 .for F in attr attrtab automata codes conditions config constants emit \
extract flags  opinit output peep preds recog
 gen$F: gen$F.o rtl.o read-rtl.o ggc-none.o vec.o min-insn-modes.o \
gensupport.o print-rtl.o errors.o ${LIBIBERTY}
-   ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
+   ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
 .endfor
 
 gencondmd: gencondmd.o
-   ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+   ${CC:N${CCACHE_BIN}} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 #
 # Generated .md files.

Modified: head/lib/libmagic/Makefile
==
--- head/lib/libmagic/Makefile  Wed Jun 27 19:28:37 2018(r335732)
+++ head/lib/libmagic/Makefile  Wed Jun 27 19:29:15 2018(r335733)
@@ -43,7 +43,7 @@ magic.mgc: mkmagic magic
 CLEANFILES+=   mkmagic
 build-tools: mkmagic
 mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} 
${BUILD_TOOLS_META}
-   ${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC:N*.h} 
\
+   ${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} 
${.ALLSRC:N*.h} \
${LDADD}
 
 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \

Modified: head/lib/libpam/static_libpam/Makefile
==
--- head/lib/libpam/static_libpam/Makefile  Wed Jun 27 19:28:37 2018
(r335732)
+++