[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  28a55a873d5a689912fb1c8cc5fdd2743fdbcdb8 (commit)
      from  5ca17d8c5c18141686e909e70bda7e8ef480ee40 (commit)


- Log -----------------------------------------------------------------
commit 28a55a873d5a689912fb1c8cc5fdd2743fdbcdb8
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 25 14:36:30 2016 +0100

    Make it possible to build even if dependency files can't be generated
    
    If the local system doesn't have GNU C or clang, and not even
    makedepend, the build will stop because the call of 'makedepend'
    fails.  This changes so the build won't stop because of such failure.
    The result will be empty .d files, and that's ok.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 339c733..2dbfaaa 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -856,7 +856,7 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/
           return <<"EOF";
 $obj$depext: $deps
 	rm -f \$\@.tmp; touch \$\@.tmp
-	\$(MAKEDEPEND) -f\$\@.tmp -o"|$obj" -- \$(CFLAGS) $ecflags$incs -- $srcs \\
+	-\$(MAKEDEPEND) -f\$\@.tmp -o"|$obj" -- \$(CFLAGS) $ecflags$incs -- $srcs \\
 	    2>/dev/null
 	sed -e 's/^.*|//' -e 's/ \\/\\(\\\\.\\|[^ ]\\)*//g' -e '/: *\$\$/d' -e '/^\\(#.*\\| *\\)\$\$/d' \$\@.tmp > \$\@
 	rm \$\@.tmp