From 8590b1f38d2f0278a730d5a7d077d24eb292e48f Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 2 Feb 2018 12:25:26 +0100 Subject: Unix Makefile: Rework the assignment of CXX and AS If the configured value is the empty string, give them a sane default. Otherwise, give them the configured value prefix with $(CROSS_COMPILE) Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5247) --- Configurations/unix-Makefile.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Configurations') diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 2a4d2df332..a7ec6a15e2 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -191,7 +191,7 @@ CPPFLAGS={- our $cppflags = join(" ", CPPFLAGS_Q={- $cppflags =~ s|([\\"])|\\$1|g; $cppflags -} CC= $(CROSS_COMPILE){- $config{cc} -} CFLAGS={- join(' ', @{$config{cflags}}) -} -CXX= $(CROSS_COMPILE){- $config{cxx} -} +CXX={- $config{cxx} ? "\$(CROSS_COMPILE)$config{cxx}" : '' -} CXXFLAGS={- join(' ', @{$config{cxxflags}}) -} LDFLAGS= {- join(' ', @{$config{lflags}}) -} PLIB_LDFLAGS= {- join(' ', @{$config{plib_lflags}}) -} @@ -236,7 +236,7 @@ TARFILE= ../$(NAME).tar # dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC # gcc, then the driver will automatically translate it to -xarch=v8plus # and pass it down to assembler. -AS={- $config{as} || '$(CC) -c' -} +AS={- $config{as} ? "\$(CROSS_COMPILE)$config{as}" : '$(CC) -c' -} ASFLAGS={- join(' ', @{$config{asflags}}) || '$(CFLAGS)' -} PERLASM_SCHEME= {- $target{perlasm_scheme} -} -- cgit v1.2.3