From 45d7a727cd71d90c60ef6b9616d4880131fb6a80 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Wed, 8 Nov 2006 12:37:05 +0000 Subject: [PATCH] Preserve ${LDFLAGS} inherited from environment for Win32 environments. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@680 81a1dc3b-b13d-400b-aceb-764788c761c2 --- avrdude/ChangeLog | 5 +++++ avrdude/configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog index def7c4a6..6d34eba6 100644 --- a/avrdude/ChangeLog +++ b/avrdude/ChangeLog @@ -1,3 +1,8 @@ +2006-11-08 Joerg Wunsch + + * configure.ac: Preserve ${LDFLAGS} inherited from environment + for Win32 environments. + 2006-11-07 Joerg Wunsch * configure.ac: Don't pretend --enable-doc were the default. diff --git a/avrdude/configure.ac b/avrdude/configure.ac index 83df5408..555f7d18 100644 --- a/avrdude/configure.ac +++ b/avrdude/configure.ac @@ -193,7 +193,7 @@ case $target in *-*-mingw32* | *-*-cygwin* | *-*-windows*) WINDOWS_DIRS="windows" CFLAGS="-mno-cygwin -DWIN32NATIVE" - LDFLAGS="-static" + LDFLAGS="${LDFLAGS} -static" ;; esac AC_SUBST(WINDOWS_DIRS,$WINDOWS_DIRS)