Mercurial > dropbear

changeset 1507:d54bbb645f02 coverity

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Matt Johnston <matt@ucc.asn.au>
date Sat, 10 Feb 2018 19:03:54 +0800
parents b7cd40b0730a (current diff) 3a916b945185 (diff)
children 3520d7c25363
files .travis.yml
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libtomcrypt/Makefile.in	Sat Feb 10 08:27:30 2018 +0800
+++ b/libtomcrypt/Makefile.in	Sat Feb 10 19:03:54 2018 +0800
@@ -22,6 +22,7 @@
 # make -f makefile.unix CC=icc AR=xiar CFLAGS="-fast -DUSE_LTM -DLTM_DESC -I/path/to/libtommath" EXTRALIBS=/path/to/libtommath/libtommath.a all
 #
 
+# Dropbear can build out of tree
 VPATH=@srcdir@
 srcdir=@srcdir@
 
@@ -32,10 +33,11 @@
 INCPATH   = $(PREFIX)/include
 DATAPATH  = $(PREFIX)/share/doc/libtomcrypt/pdf
 BINPATH   = $(PREFIX)/bin
-CC        = cc
-AR        = ar
+# Dropbear passes paths from parent makefile
+#CC        = cc
+#AR        = ar
 ARFLAGS   = r
-RANLIB    = ranlib
+#RANLIB    = ranlib
 #CFLAGS    = -O2 -DUSE_LTM -DLTM_DESC -I../libtommath
 EXTRALIBS = ../libtommath/libtommath.a