Pass $(CC) to perlasm scripts via the environment

It seems that on some platforms, the perlasm scripts call the C
compiler for certain checks.  These scripts need the environment
variable CC to have the C compiler command.

Reviewed-by: Rich Salz <rsalz@openssl.org>

1 files changed, 27 insertions, 27 deletions

diff --git a/crypto/bn/build.info b/crypto/bn/build.info
index bb410f271e..0a462a173f 100644
--- a/crypto/bn/build.info
+++ b/crypto/bn/build.info
@@ -13,28 +13,28 @@ BEGINRAW[Makefile]
 ##### BN assembler implementations
 
 {- $builddir -}/bn-586.s:	{- $sourcedir -}/asm/bn-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl
-	$(PERL) {- $sourcedir -}/asm/bn-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/bn-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 {- $builddir -}/co-586.s:	{- $sourcedir -}/asm/co-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl
-	$(PERL) {- $sourcedir -}/asm/co-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/co-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 {- $builddir -}/x86-mont.s:	{- $sourcedir -}/asm/x86-mont.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl
-	$(PERL) {- $sourcedir -}/asm/x86-mont.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/x86-mont.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 {- $builddir -}/x86-gf2m.s:	{- $sourcedir -}/asm/x86-gf2m.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl
-	$(PERL) {- $sourcedir -}/asm/x86-gf2m.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/x86-gf2m.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 
 {- $builddir -}/sparcv8.o:	{- $sourcedir -}/asm/sparcv8.S
 	$(CC) $(CFLAGS) -c {- $sourcedir -}/asm/sparcv8.S
 {- $builddir -}/bn-sparcv9.o:	{- $sourcedir -}/asm/sparcv8plus.S
 	$(CC) $(CFLAGS) -c -o $@ {- $sourcedir -}/asm/sparcv8plus.S
 {- $builddir -}/sparcv9a-mont.s:	{- $sourcedir -}/asm/sparcv9a-mont.pl
-	$(PERL) {- $sourcedir -}/asm/sparcv9a-mont.pl $(CFLAGS) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/sparcv9a-mont.pl $(CFLAGS) > $@
 {- $builddir -}/sparcv9-mont.s:		{- $sourcedir -}/asm/sparcv9-mont.pl
-	$(PERL) {- $sourcedir -}/asm/sparcv9-mont.pl $(CFLAGS) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/sparcv9-mont.pl $(CFLAGS) > $@
 {- $builddir -}/vis3-mont.s:		{- $sourcedir -}/asm/vis3-mont.pl
-	$(PERL) {- $sourcedir -}/asm/vis3-mont.pl $(CFLAGS) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/vis3-mont.pl $(CFLAGS) > $@
 {- $builddir -}/sparct4-mont.S:	{- $sourcedir -}/asm/sparct4-mont.pl
-	$(PERL) {- $sourcedir -}/asm/sparct4-mont.pl $(CFLAGS) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/sparct4-mont.pl $(CFLAGS) > $@
 {- $builddir -}/sparcv9-gf2m.S:	{- $sourcedir -}/asm/sparcv9-gf2m.pl
-	$(PERL) {- $sourcedir -}/asm/sparcv9-gf2m.pl $(CFLAGS) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/sparcv9-gf2m.pl $(CFLAGS) > $@
 
 {- $builddir -}/bn-mips3.o:	{- $sourcedir -}/asm/mips3.s
 	@if [ "$(CC)" = "gcc" ]; then \
@@ -43,56 +43,56 @@ BEGINRAW[Makefile]
 	else	$(CC) -c $(CFLAGS) -o $@ {- $sourcedir -}/asm/mips3.s; fi
 
 {- $builddir -}/bn-mips.s:	{- $sourcedir -}/asm/mips.pl
-	$(PERL) {- $sourcedir -}/asm/mips.pl $(PERLASM_SCHEME) $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/mips.pl $(PERLASM_SCHEME) $@
 {- $builddir -}/mips-mont.s:	{- $sourcedir -}/asm/mips-mont.pl
-	$(PERL)	{- $sourcedir -}/asm/mips-mont.pl $(PERLASM_SCHEME) $@
+	CC="$(CC)" $(PERL)	{- $sourcedir -}/asm/mips-mont.pl $(PERLASM_SCHEME) $@
 
 {- $builddir -}/bn-s390x.o:	{- $sourcedir -}/asm/s390x.S
 	$(CC) $(CFLAGS) -c -o $@ {- $sourcedir -}/asm/s390x.S
 {- $builddir -}/s390x-gf2m.s:	{- $sourcedir -}/asm/s390x-gf2m.pl
-	$(PERL) {- $sourcedir -}/asm/s390x-gf2m.pl $(PERLASM_SCHEME) $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/s390x-gf2m.pl $(PERLASM_SCHEME) $@
 
 {- $builddir -}/x86_64-mont.s:	{- $sourcedir -}/asm/x86_64-mont.pl
-	$(PERL) {- $sourcedir -}/asm/x86_64-mont.pl $(PERLASM_SCHEME) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/x86_64-mont.pl $(PERLASM_SCHEME) > $@
 {- $builddir -}/x86_64-mont5.s:	{- $sourcedir -}/asm/x86_64-mont5.pl
-	$(PERL) {- $sourcedir -}/asm/x86_64-mont5.pl $(PERLASM_SCHEME) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/x86_64-mont5.pl $(PERLASM_SCHEME) > $@
 {- $builddir -}/x86_64-gf2m.s:	{- $sourcedir -}/asm/x86_64-gf2m.pl
-	$(PERL) {- $sourcedir -}/asm/x86_64-gf2m.pl $(PERLASM_SCHEME) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/x86_64-gf2m.pl $(PERLASM_SCHEME) > $@
 {- $builddir -}/rsaz-x86_64.s:	{- $sourcedir -}/asm/rsaz-x86_64.pl
-	$(PERL) {- $sourcedir -}/asm/rsaz-x86_64.pl $(PERLASM_SCHEME) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rsaz-x86_64.pl $(PERLASM_SCHEME) > $@
 {- $builddir -}/rsaz-avx2.s:	{- $sourcedir -}/asm/rsaz-avx2.pl 
-	$(PERL) {- $sourcedir -}/asm/rsaz-avx2.pl $(PERLASM_SCHEME) > $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/rsaz-avx2.pl $(PERLASM_SCHEME) > $@
 
 {- $builddir -}/bn-ia64.s:	{- $sourcedir -}/asm/ia64.S
 	$(CC) $(CFLAGS) -E {- $sourcedir -}/asm/ia64.S > $@
 {- $builddir -}/ia64-mont.s:	{- $sourcedir -}/asm/ia64-mont.pl
-	$(PERL) {- $sourcedir -}/asm/ia64-mont.pl $@ $(CFLAGS)
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ia64-mont.pl $@ $(CFLAGS)
 
 # GNU assembler fails to compile PA-RISC2 modules, insist on calling
 # vendor assembler...
 {- $builddir -}/pa-risc2W.o: {- $sourcedir -}/asm/pa-risc2W.s
-	$(PERL) $(TOP)/util/fipsas.pl $(TOP) $< /usr/ccs/bin/as -o pa-risc2W.o {- $sourcedir -}/asm/pa-risc2W.s
+	CC="$(CC)" $(PERL) $(TOP)/util/fipsas.pl $(TOP) $< /usr/ccs/bin/as -o pa-risc2W.o {- $sourcedir -}/asm/pa-risc2W.s
 {- $builddir -}/pa-risc2.o: {- $sourcedir -}/asm/pa-risc2.s
-	$(PERL) $(TOP)/util/fipsas.pl $(TOP) $< /usr/ccs/bin/as -o pa-risc2.o {- $sourcedir -}/asm/pa-risc2.s
+	CC="$(CC)" $(PERL) $(TOP)/util/fipsas.pl $(TOP) $< /usr/ccs/bin/as -o pa-risc2.o {- $sourcedir -}/asm/pa-risc2.s
 
 {- $builddir -}/parisc-mont.s:	{- $sourcedir -}/asm/parisc-mont.pl
-	$(PERL) {- $sourcedir -}/asm/parisc-mont.pl $(PERLASM_SCHEME) $@
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/parisc-mont.pl $(PERLASM_SCHEME) $@
 
 # ppc - AIX, Linux, MacOS X...
-{- $builddir -}/bn-ppc.s:	{- $sourcedir -}/asm/ppc.pl;	$(PERL) {- $sourcedir -}/asm/ppc.pl $(PERLASM_SCHEME) $@
-{- $builddir -}/ppc-mont.s:	{- $sourcedir -}/asm/ppc-mont.pl;$(PERL) {- $sourcedir -}/asm/ppc-mont.pl $(PERLASM_SCHEME) $@
-{- $builddir -}/ppc64-mont.s:	{- $sourcedir -}/asm/ppc64-mont.pl;$(PERL) {- $sourcedir -}/asm/ppc64-mont.pl $(PERLASM_SCHEME) $@
+{- $builddir -}/bn-ppc.s:	{- $sourcedir -}/asm/ppc.pl;	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ppc.pl $(PERLASM_SCHEME) $@
+{- $builddir -}/ppc-mont.s:	{- $sourcedir -}/asm/ppc-mont.pl;CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ppc-mont.pl $(PERLASM_SCHEME) $@
+{- $builddir -}/ppc64-mont.s:	{- $sourcedir -}/asm/ppc64-mont.pl;CC="$(CC)" $(PERL) {- $sourcedir -}/asm/ppc64-mont.pl $(PERLASM_SCHEME) $@
 
 {- $builddir -}/alpha-mont.s:	{- $sourcedir -}/asm/alpha-mont.pl
 	(preproc=$$$$.$@.S; trap "rm $$preproc" INT; \
-	$(PERL) {- $sourcedir -}/asm/alpha-mont.pl > $$preproc && \
+	CC="$(CC)" $(PERL) {- $sourcedir -}/asm/alpha-mont.pl > $$preproc && \
 	$(CC) -E -P $$preproc > $@ && rm $$preproc)
 
 # GNU make "catch all"
 {- $builddir -}/%-mont.S:	{- $sourcedir -}/asm/%-mont.pl
-	$(PERL) $< $(PERLASM_SCHEME) $@
+	CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 {- $builddir -}/%-gf2m.S:	{- $sourcedir -}/asm/%-gf2m.pl
-	$(PERL) $< $(PERLASM_SCHEME) $@
+	CC="$(CC)" $(PERL) $< $(PERLASM_SCHEME) $@
 
 {- $builddir -}/armv4-mont.o:	{- $builddir -}/armv4-mont.S
 {- $builddir -}/armv4-gf2m.o:	{- $builddir -}/armv4-gf2m.S