aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-rwxr-xr-xld/configure6
-rw-r--r--ld/configure.in3
2 files changed, 4 insertions, 5 deletions
diff --git a/ld/configure b/ld/configure
index 21a278f..d52d28a 100755
--- a/ld/configure
+++ b/ld/configure
@@ -1354,7 +1354,7 @@ case "$host" in
CFLAGS="$CFLAGS -belf"
;;
-*-*-cygwin32*)
+*-*-cygwin*)
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -3472,7 +3472,7 @@ else
#include "confdefs.h"
int main() {
-return __CYGWIN__;
+return __CYGWIN32__;
; return 0; }
EOF
if { (eval echo configure:3479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -4274,7 +4274,7 @@ if test x${all_targets} = xtrue; then
else
EMULATION_OFILES='$(ALL_EMULATIONS)'
fi
- EMUL_EXTRA_OFILES=''
+ EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)'
else
EMULATION_OFILES=$all_emuls
EMUL_EXTRA_OFILES=$all_emul_extras
diff --git a/ld/configure.in b/ld/configure.in
index 2905609..6846641 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -42,7 +42,6 @@ AM_PROG_INSTALL
ALL_LINGUAS=
CY_GNU_GETTEXT
-AM_CYGWIN32
AM_EXEEXT
AC_PROG_YACC
@@ -137,7 +136,7 @@ if test x${all_targets} = xtrue; then
else
EMULATION_OFILES='$(ALL_EMULATIONS)'
fi
- EMUL_EXTRA_OFILES=''
+ EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)'
else
EMULATION_OFILES=$all_emuls
EMUL_EXTRA_OFILES=$all_emul_extras