Commit 57ade571 authored by Roumen Petrov's avatar Roumen Petrov Committed by Richard Levitte
Browse files

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: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 7a533600

Configurations/unix-Makefile.tmpl

+5 −5
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ EOF 
$target: $args{generator}->[0] $deps

	( trap "rm -f \$@.*" INT 0; \\

	  $generator \$@.S; \\

	  \$(CC) \$(CFLAGS) $incs -E \$@.S | \\

	  \$(CC) $incs \$(CFLAGS) -E \$@.S | \\

	  \$(PERL) -ne '/^#(line)?\\s*[0-9]+/ or print' > \$@.i && \\

	  mv -f \$@.i \$@ )

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; \\

Configurations/windows-makefile.tmpl

+4 −4
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ EOF 
$target: "$args{generator}->[0]" $deps

	set ASM=\$(AS)

	$generator \$@.S

	\$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@.i && move /Y \$@.i \$@

	\$(CC) $incs \$(CFLAGS) /EP /C \$@.S > \$@.i && move /Y \$@.i \$@

        del /Q \$@.S

EOF

              }
@@ -362,7 +362,7 @@ EOF 
          }

          return <<"EOF";

$target: "$args{generator}->[0]" $deps

	\$(CC) \$(CFLAGS) $incs /EP /C "$args{generator}->[0]" > \$@.i && move /Y \$@.i \$@

	\$(CC) $incs \$(CFLAGS) /EP /C "$args{generator}->[0]" > \$@.i && move /Y \$@.i \$@

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

 }