aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Brown2010-07-24 14:44:54 -0400
committerKen Brown2010-07-24 14:44:54 -0400
commit0c1085c50717c5596d0255bc8ef1c82153e56fd0 (patch)
tree30e402f9f2a565a4d559684be36267ab669b6540
parent6a0d66114298bd68c2ce20fbeea485f6e2fb928e (diff)
downloademacs-0c1085c50717c5596d0255bc8ef1c82153e56fd0.tar.gz
emacs-0c1085c50717c5596d0255bc8ef1c82153e56fd0.zip
* configure.in (LINKER, LIB_GCC): Remove cygwin special cases (Bug#6715)
-rw-r--r--ChangeLog4
-rw-r--r--configure.in7
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fea5befe8d..2746258e0c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12010-07-24 Ken Brown <kbrown@cornell.edu>
2
3 * configure.in (LINKER, LIB_GCC): Remove cygwin special cases (Bug#6715)
4
12010-07-24 Juanma Barranquero <lekktu@gmail.com> 52010-07-24 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * .bzrignore, .gitignore: Ignore README.W32 on the root directory. 7 * .bzrignore, .gitignore: Ignore README.W32 on the root directory.
diff --git a/configure.in b/configure.in
index 81aaead72e7..a6fde6eca65 100644
--- a/configure.in
+++ b/configure.in
@@ -3326,9 +3326,7 @@ LINKER=
3326ORDINARY_LINK= 3326ORDINARY_LINK=
3327case "$opsys" in 3327case "$opsys" in
3328 ## gnu: GNU needs its own crt0. 3328 ## gnu: GNU needs its own crt0.
3329 aix4-2|darwin|gnu|usg5-4|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;; 3329 aix4-2|cygwin|darwin|gnu|usg5-4|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;;
3330
3331 cygwin) LINKER="\$(CC)" ;;
3332 3330
3333 ## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the 3331 ## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the
3334 ## library search parth, i.e. it won't search /usr/lib for libc and 3332 ## library search parth, i.e. it won't search /usr/lib for libc and
@@ -3381,8 +3379,7 @@ LIB_GCC=
3381if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then 3379if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
3382 3380
3383 case "$opsys" in 3381 case "$opsys" in
3384 ## cygwin: don't link against static libgcc. 3382 freebsd|netbsd|openbsd) LIB_GCC= ;;
3385 cygwin|freebsd|netbsd|openbsd) LIB_GCC= ;;
3386 3383
3387 gnu-*) 3384 gnu-*)
3388 ## armin76@gentoo.org reported that the lgcc_s flag is necessary to 3385 ## armin76@gentoo.org reported that the lgcc_s flag is necessary to