]>
Commit | Line | Data |
---|---|---|
1c6e2c73 JB |
1 | --- openssl-1.1.0g/Configurations/unix-Makefile.tmpl.orig 2017-11-19 10:16:26.044446930 +0100 |
2 | +++ openssl-1.1.0g/Configurations/unix-Makefile.tmpl 2017-11-19 17:44:59.020806300 +0100 | |
3 | @@ -208,8 +208,7 @@ | |
4 | # dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC | |
5 | # gcc, then the driver will automatically translate it to -xarch=v8plus | |
6 | # and pass it down to assembler. | |
7 | -AS=$(CC) -c | |
8 | -ASFLAG=$(CFLAGS) | |
9 | +ASFLAG= | |
10 | PERLASM_SCHEME= {- $target{perlasm_scheme} -} | |
37654b37 | 11 | |
1c6e2c73 JB |
12 | # For x86 assembler: Set PROCESSOR to 386 if you want to support |
13 | @@ -847,13 +846,14 @@ | |
14 | my $ecflags = { lib => '$(LIB_CFLAGS)', | |
15 | dso => '$(DSO_CFLAGS)', | |
16 | bin => '$(BIN_CFLAGS)' } -> {$args{intent}}; | |
17 | + my $asflags = ($srcs =~ /\.[Ss]$/) ? '$(ASFLAG)' : ''; | |
18 | my $makedepprog = $config{makedepprog}; | |
19 | my $recipe = <<"EOF"; | |
20 | $obj$objext: $deps | |
21 | EOF | |
22 | if (!$disabled{makedepend} && $makedepprog !~ /\/makedepend/) { | |
23 | $recipe .= <<"EOF"; | |
24 | - \$(CC) $incs \$(CFLAGS) $ecflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs | |
25 | + \$(CC) $incs \$(CFLAGS) $ecflags $asflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs | |
26 | \@touch $obj$depext.tmp | |
27 | \@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\ | |
28 | rm -f $obj$depext.tmp; \\ |