Commit 076e596f authored by Richard Levitte's avatar Richard Levitte
Browse files

Quote the CFLAG in Unixly Makefiles, for buildinf.h 

Because the command line definitions of OPENSSLDIR and ENGINESDIR
contain quotes, we need a variant of CFLAG where backslashes and
quotes are escaped when we produce buildinf.h

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 9ca2529d

Configurations/unix-Makefile.tmpl

+2 −1
Changes for Configurations/unix-Makefile.tmpl: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ HTMLSUFFIX=html 


CROSS_COMPILE= {- $config{cross_compile_prefix} -}

CC= $(CROSS_COMPILE){- $target{cc} -}

CFLAGS={- join(" ",(map { "-D".$_} @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $config{cflags} -}

CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $config{cflags} -}

CFLAGS_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -}

DEPFLAGS= {- join(" ",map { "-D".$_} @{$config{depdefines}}) -}

LDFLAGS= {- $config{lflags} -}

PLIB_LDFLAGS= {- $config{plib_lflags} -}

Makefile.in

+3 −2
Changes for Makefile.in: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ ENGINESDIR={- use File::Spec::Functions; 


CROSS_COMPILE= {- $config{cross_compile_prefix} -}

CC= $(CROSS_COMPILE){- $target{cc} -}

CFLAG={- join(" ",(map { "-D".$_} @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $config{cflags} -}

CFLAG={- our $cflags2 = join(" ",(map { "-D".$_} @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $config{cflags} -}

CFLAG_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -}

DEPFLAG= {- join(" ",map { "-D".$_} @{$config{depdefines}}) -}

LDFLAG= {- $config{lflags} -}

PLIB_LDFLAG= {- $config{plib_lflags} -}
@@ -243,7 +244,7 @@ CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \ 
# LC_ALL=C ensures that error [and other] messages are delivered in

# same language for uniform treatment.

BUILDENV=	LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\

		CC='$(CC)' CFLAG='$(CFLAG)' 			\

		CC='$(CC)' CFLAG='$(CFLAG)' CFLAG_Q='$(CFLAG_Q)'	\

		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\

		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\

		CROSS_COMPILE='$(CROSS_COMPILE)'	\

crypto/Makefile.in

+1 −1
Changes for crypto/Makefile.in: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ fips: cryptlib.o thr_id.o uid.o $(CPUID_OBJ) 
		done;



buildinf.h: ../Makefile

	$(PERL) $(TOP)/util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" >buildinf.h

	$(PERL) $(TOP)/util/mkbuildinf.pl "$(CC) $(CFLAGS_Q)" "$(PLATFORM)" >buildinf.h



x86cpuid.s:	x86cpuid.pl perlasm/x86asm.pl

	$(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

crypto/build.info

+1 −1
Changes for crypto/build.info: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ ENDRAW[descrip.mms] 


BEGINRAW[Makefile]

crypto/buildinf.h : Makefile

	$(PERL) $(SRCDIR)/util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" > crypto/buildinf.h

	$(PERL) $(SRCDIR)/util/mkbuildinf.pl "$(CC) $(CFLAGS_Q)" "$(PLATFORM)" > crypto/buildinf.h



##### APPLINK, UPLINK and CPUID assembler implementations