diff options
| author | sof <unknown> | 2004-10-12 16:33:01 +0000 |
|---|---|---|
| committer | sof <unknown> | 2004-10-12 16:33:01 +0000 |
| commit | b6d70ef77033fd09f7bfb9c020fd9e40b3dbac29 (patch) | |
| tree | 919d66a4ce64bc18d895e2bb736d0299266b2a5d | |
| parent | 6a4854eaa266d994ebd0d471614a52b43dd329d9 (diff) | |
| download | haskell-b6d70ef77033fd09f7bfb9c020fd9e40b3dbac29.tar.gz | |
[project @ 2004-10-12 16:33:00 by sof]
Had enough of 'make boot' completely rebuilding gmp/ each time around.
| -rw-r--r-- | ghc/rts/Makefile | 8 | ||||
| -rw-r--r-- | ghc/rts/gmp/configure | 10 |
2 files changed, 15 insertions, 3 deletions
diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile index efc244dd5d..cf81863ac4 100644 --- a/ghc/rts/Makefile +++ b/ghc/rts/Makefile @@ -225,8 +225,12 @@ endif ifneq "$(HaveLibGmp)" "YES" ifneq "$(HaveFrameworkHaskellSupport)" "YES" boot :: - cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no \ - --host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'` + if [ -f gmp/config.status ]; then \ + cd gmp && CC=$(WhatGccIsCalled) ./config.status; \ + else \ + cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no \ + --host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`; \ + fi # Slight cheatage here to pass host as target, but x-compilation isn't supported by ghc. diff --git a/ghc/rts/gmp/configure b/ghc/rts/gmp/configure index 8b7be879d5..8294680486 100644 --- a/ghc/rts/gmp/configure +++ b/ghc/rts/gmp/configure @@ -5173,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 |