Mercurial > dropbear
changeset 1576:0c8c2552b2f2
merge
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sat, 03 Mar 2018 11:11:04 +0800 |
| parents | b66fc351f7e8 (diff) e75dab5bec71 (current diff) |
| children | 399d8eb961b5 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sat Mar 03 04:06:45 2018 +0100 +++ b/Makefile.in Sat Mar 03 11:11:04 2018 +0800 @@ -61,7 +61,7 @@ SCPOBJS=scp.o progressmeter.o atomicio.o scpmisc.o compat.o ifeq (@DROPBEAR_FUZZ@, 1) - allobjs = $(COMMONOBJS) fuzz-common.o fuzz-wrapfd.o $(CLISVROBJS) $(CLIOBJS) $(SVROBJS) + allobjs = $(COMMONOBJS) fuzz-common.o fuzz-wrapfd.o $(CLISVROBJS) $(CLIOBJS) $(SVROBJS) @CRYPTLIB@ allobjs:=$(subst svr-main.o, ,$(allobjs)) allobjs:=$(subst cli-main.o, ,$(allobjs)) allobjs:=$(sort $(allobjs))
--- a/configure.ac Sat Mar 03 04:06:45 2018 +0100 +++ b/configure.ac Sat Mar 03 11:11:04 2018 +0800 @@ -15,6 +15,7 @@ AC_MSG_NOTICE([Source directory Mercurial base revision $hgrev]) fi +ORIGCFLAGS="$CFLAGS" # Checks for programs. AC_PROG_CC @@ -35,7 +36,7 @@ }]) # set compile flags prior to other tests -if test -z "$OLDCFLAGS" && test "$GCC" = "yes"; then +if test -z "$ORIGCFLAGS" && test "$GCC" = "yes"; then AC_MSG_NOTICE(No \$CFLAGS set... using "-Os -W -Wall" for GCC) CFLAGS="-Os -W -Wall" fi