X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2Fgmp%2Fconfigure;h=82946804862778db71401e6483e424f231f5adc4;hb=b6d70ef77033fd09f7bfb9c020fd9e40b3dbac29;hp=784dac7ae8cef664c481ac4390755d311351e47b;hpb=c72d045ce033d7c785731f68b8cabe9a6f3fe75b;p=ghc-hetmet.git

diff --git a/ghc/rts/gmp/configure b/ghc/rts/gmp/configure
index 784dac7..8294680 100644
--- a/ghc/rts/gmp/configure
+++ b/ghc/rts/gmp/configure
@@ -3094,7 +3094,13 @@ if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ECHO_N "checking for ld used by GCC... $ECHO_C" 1>&6
 echo "configure:3090: checking for ld used by GCC" 1>&5
-  ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  case $target in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
   case "$ac_prog" in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
@@ -5167,10 +5173,18 @@ for ac_file in : $CONFIG_LINKS; do if test "x$ac_file" != x:; then
       *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
   esac
 
+  # Note: Dodgy local mods to 'make things work' in an environment (cygwin)
+  # that supports symlinks (through silly hack) using tools that don't
+  # understand them (mingw). The end sometimes justifies the means, son.
+  #
   # Make a symlink if possible; otherwise try a hard link.
   #if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
   #   ln $srcdir/$ac_source $ac_dest; then :
-  if cp $srcdir/$ac_source $ac_dest; then :
+  # 
+  # Note: If the -p offends your 'cp', just drop it; no harm done, you'll just 
+  # get more recompilations.
+  # 
+  if cp -p $srcdir/$ac_source $ac_dest; then :
   else
     { echo "configure: error: cannot copy $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
   fi