diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 466a4a303d5..18d83fd50e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ +2004-03-21 Dave Love <fx@gnu.org> + + * configure.in: Fix previous change. + 2004-03-18 Dave Love <fx@gnu.org> - * configure.in: Add -znocombreloc to LDFLAGS if supported. + * configure.in: Add -znocombreloc to LDFLAGS if compiler supports it. 2004-03-15 Luc Teirlinck <teirllm@auburn.edu> diff --git a/configure.in b/configure.in index 8f80608f4a7..3e89bea0c2d 100644 --- a/configure.in +++ b/configure.in @@ -1276,8 +1276,15 @@ fi dnl We need -znocombreloc if we're using a relatively recent GNU ld. dnl If we can link with the flag, it shouldn't do any harm anyhow. dnl (Don't use `-z nocombreloc' as -z takes no arg on Irix.) +dnl Treat GCC specially since it just gives a non-fatal `unrecognized option' +dnl if not built to support GNU ld. + late_LDFLAGS=$LDFLAGS -LDFLAGS="$LDFLAGS -znocombreloc" +if test $GCC = yes; then + LDFLAGS="$LDFLAGS -Wl,-znocombreloc" +else + LDFLAGS="$LDFLAGS -znocombreloc" +fi AC_MSG_CHECKING([For -znocombreloc]) AC_LINK_IFELSE([main(){return 0;}], |