diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-03-11 11:55:44 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-03-11 15:29:49 +0100 |
| commit | 0218fc3778428a7b485335bb369f0040d97d74cf (patch) | |
| tree | 0595f50ec4a9bcf159a414b9227d62d403440e18 /Configurations | |
| parent | d0db7ee0b1dfc72a5e7c105040b8580ee57e99eb (diff) | |
| download | openssl-0218fc3778428a7b485335bb369f0040d97d74cf.zip openssl-0218fc3778428a7b485335bb369f0040d97d74cf.tar.gz openssl-0218fc3778428a7b485335bb369f0040d97d74cf.tar.bz2 | |
Configurations/unix-Makefile.tmpl: don't leave empty .s files behind.
If pre-processor failed, an empty .s file could be left behind,
which could get successfully compiled if one simply re-ran make
and cause linking failures. Not anymore. Remove even intermediate .S
in case of pre-processor failure.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 3718467..05844f0 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -850,9 +850,9 @@ EOF (my $target = $args{src}) =~ s|\.S$|.s|; return <<"EOF"; $target: $args{generator}->[0] - ( trap "rm -f \$@.S" INT; \\ + ( trap "rm -f \$@.*" INT 0; \\ $generator \$@.S; \\ - \$(CC) \$(CFLAGS) $incs -E -P \$@.S > \$@ && rm -f \$@.S ) + \$(CC) \$(CFLAGS) $incs -E -P \$@.S > \$@.i && mv -f \$@.i \$@ ) EOF } # Otherwise.... |