projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-10-12 16:33:00 by sof]
[ghc-hetmet.git]
/
ghc
/
rts
/
gmp
/
configure
diff --git
a/ghc/rts/gmp/configure
b/ghc/rts/gmp/configure
index
7a9ea3a
..
8294680
100644
(file)
--- a/
ghc/rts/gmp/configure
+++ b/
ghc/rts/gmp/configure
@@
-3097,9
+3097,7
@@
echo "configure:3090: checking for ld used by GCC" 1>&5
case $target in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
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'`
- # convert /mingw/mingw32/... into c:/mingw/mingw32/...
- ac_prog="C:""$ac_prog" ;;
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
esac
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
esac
@@
-5175,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
*) 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 :
# 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
else
{ echo "configure: error: cannot copy $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
fi