summaryrefslogtreecommitdiff
path: root/validate
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2016-01-04 18:29:49 +0100
committerBen Gamari <ben@smart-cactus.org>2016-01-04 18:29:50 +0100
commit4c56ad36ee0d1f8b6f1b2bc0d8fff1c9acd1a389 (patch)
treec572b428254c5fd605f05caa349c2560c696ef2b /validate
parent5c10f5ce8831a59f67f2c42ed5d7cf5be10c0860 (diff)
downloadhaskell-4c56ad36ee0d1f8b6f1b2bc0d8fff1c9acd1a389.tar.gz
Build system: delete ghc-pwd
On Windows, with msys2, `pwd` works (as can be seen by the use of `pwd` that slipped into the validate script), so there is really no need for `ghc-pwd` anymore. Test Plan: try it Reviewers: austin, bgamari, Phyx Reviewed By: Phyx Subscribers: Phyx, erikd Differential Revision: https://phabricator.haskell.org/D1731
Diffstat (limited to 'validate')
-rwxr-xr-xvalidate6
1 files changed, 3 insertions, 3 deletions
diff --git a/validate b/validate
index 3b2100235b..d6bc1bfeb6 100755
--- a/validate
+++ b/validate
@@ -161,10 +161,12 @@ $make -C utils/checkUniques
if [ $testsuite_only -eq 0 ]; then
+thisdir=`pwd`
+
if [ $no_clean -eq 0 ]; then
$make maintainer-clean NO_CLEAN_GMP=YES
- INSTDIR=`pwd`/inst
+ INSTDIR="$thisdir/inst"
if [ $use_dph -eq 1 ]; then
perl -w boot --validate --required-tag=dph
@@ -174,8 +176,6 @@ if [ $no_clean -eq 0 ]; then
./configure --prefix="$INSTDIR" $config_args
fi
-thisdir=`utils/ghc-pwd/dist-boot/ghc-pwd`
-
echo "Validating=YES" > mk/are-validating.mk
echo "ValidateSpeed=$speed" >> mk/are-validating.mk
echo "ValidateHpc=$hpc" >> mk/are-validating.mk