[openssl-commits] [openssl] master update

paul.dale at oracle.com paul.dale at oracle.com
Fri Jul 7 03:34:59 UTC 2017


The branch master has been updated
       via  ab3e8f63154c7daea9e67846aa83b6e1de7f8969 (commit)
      from  1ef454181394b474ed590c551f659b4ce11aa093 (commit)


- Log -----------------------------------------------------------------
commit ab3e8f63154c7daea9e67846aa83b6e1de7f8969
Author: Pauli <paul.dale at oracle.com>
Date:   Fri Jul 7 11:44:52 2017 +1000

    Rearrange link line so the libraries come after the source.
    Some linkers like it this way.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3879)

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

Summary of changes:
 demos/bio/Makefile | 2 +-
 demos/evp/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demos/bio/Makefile b/demos/bio/Makefile
index 493e8a5..5a4e4a4 100644
--- a/demos/bio/Makefile
+++ b/demos/bio/Makefile
@@ -27,4 +27,4 @@ server-cmod: server-cmod.o
 server-conf: server-conf.o
 
 client-arg client-conf saccept sconnect server-arg server-cmod server-conf:
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
diff --git a/demos/evp/Makefile b/demos/evp/Makefile
index 72c6e81..3a85b22 100644
--- a/demos/evp/Makefile
+++ b/demos/evp/Makefile
@@ -17,4 +17,4 @@ aesccm: aesccm.o
 aesgcm: aesgcm.o
 
 aesccm aesgcm:
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)


More information about the openssl-commits mailing list