The branch master has been updated
via 57ade5711b8b80c19f3d33f46d0e0acd48e68e0a (commit)
from 7a53360031a505d4bb55f3c7877ded5d165bef5a (commit)
- Log -----------------------------------------------------------------
commit 57ade5711b8b80c19f3d33f46d0e0acd48e68e0a
Author: Roumen Petrov <[email protected]>
Date: Mon Jun 27 21:24:07 2016 +0200
Use include paths to our source before any other cflags
This is just in case someone passed an inclusion path with the
configuration, and there are OpenSSL headers from another version
in there.
Reviewed-by: Tim Hudson <[email protected]>
Reviewed-by: Richard Levitte <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 10 +++++-----
Configurations/windows-makefile.tmpl | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index 2ec5076..c5d59b8 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -871,7 +871,7 @@ EOF
$target: $args{generator}->[0] $deps
( trap "rm -f \$@.*" INT 0; \\
$generator \[email protected]; \\
- \$(CC) \$(CFLAGS) $incs -E \[email protected] | \\
+ \$(CC) $incs \$(CFLAGS) -E \[email protected] | \\
\$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \[email protected] && \\
mv -f \[email protected] \$@ )
EOF
@@ -884,7 +884,7 @@ EOF
}
return <<"EOF";
$args{src}: $args{generator}->[0] $deps
- \$(CC) \$(CFLAGS) $incs -E \$< | \\
+ \$(CC) $incs \$(CFLAGS) -E \$< | \\
\$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@
EOF
}
@@ -918,7 +918,7 @@ EOF
if (!$disabled{makedepend} && $makedepprog =~ /\/makedepend/) {
$recipe .= <<"EOF";
$obj$depext: $deps
- -\$(MAKEDEPEND) -f- -o"|$obj$objext" -- \$(CFLAGS) $ecflags$incs --
$srcs \\
+ -\$(MAKEDEPEND) -f- -o"|$obj$objext" -- $incs \$(CFLAGS) $ecflags --
$srcs \\
>\$\@.tmp 2>/dev/null
-\$(PERL) -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; \$\$_ = undef if
(/: *\$\$/ || /^(#.*| *)\$\$/); \$\$_.="\\n" unless !defined(\$\$_) or
/\\R\$\$/g;' \$\@.tmp
\@if cmp \$\@.tmp \$\@ > /dev/null 2> /dev/null; then \\
@@ -932,13 +932,13 @@ EOF
if ($disabled{makedepend} || $makedepprog =~ /\/makedepend/) {
$recipe .= <<"EOF";
$obj$objext: $deps
- \$(CC) \$(CFLAGS) $ecflags$incs -c -o \$\@ $srcs
+ \$(CC) $incs \$(CFLAGS) $ecflags -c -o \$\@ $srcs
EOF
}
if (!$disabled{makedepend} && $makedepprog !~ /\/makedepend/) {
$recipe .= <<"EOF";
$obj$objext: $deps
- \$(CC) \$(CFLAGS) $ecflags$incs -MMD -MF $obj$depext.tmp -MT \$\@ -c -o
\$\@ $srcs
+ \$(CC) $incs \$(CFLAGS) $ecflags -MMD -MF $obj$depext.tmp -MT \$\@ -c
-o \$\@ $srcs
\@touch $obj$depext.tmp
\@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\
rm -f $obj$depext.tmp; \\
diff --git a/Configurations/windows-makefile.tmpl
b/Configurations/windows-makefile.tmpl
index aae7de3..776109f 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -349,7 +349,7 @@ EOF
$target: "$args{generator}->[0]" $deps
set ASM=\$(AS)
$generator \[email protected]
- \$(CC) \$(CFLAGS) $incs /EP /C \[email protected] > \[email protected] && move /Y \[email protected] \$@
+ \$(CC) $incs \$(CFLAGS) /EP /C \[email protected] > \[email protected] && move /Y \[email protected] \$@
del /Q \[email protected]
EOF
}
@@ -362,7 +362,7 @@ EOF
}
return <<"EOF";
$target: "$args{generator}->[0]" $deps
- \$(CC) \$(CFLAGS) $incs /EP /C "$args{generator}->[0]" > \[email protected] && move
/Y \[email protected] \$@
+ \$(CC) $incs \$(CFLAGS) /EP /C "$args{generator}->[0]" > \[email protected] && move
/Y \[email protected] \$@
EOF
}
}
@@ -400,13 +400,13 @@ s/^Note: including file: *//;
END { print '$obj$objext: ',join(" ", sort keys \%collect),"\\n" }
<<
$obj$objext: $obj$depext
- \$(CC) \$(CFLAGS) $ecflags$incs -c \$(COUTFLAG)\$\@ @<<
+ \$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ @<<
$srcs
<<
EOF
return <<"EOF" if ($disabled{makedepend});
$obj$objext: $deps
- \$(CC) \$(CFLAGS) $ecflags$incs -c \$(COUTFLAG)\$\@ $srcs
+ \$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ $srcs
EOF
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
