summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-07-03 00:16:16 +0100
committerIan Lynagh <ian@well-typed.com>2013-07-03 12:13:57 +0100
commitc548fec4f11920244e81b9f83ebb2aaf7d08ba40 (patch)
tree29130a609525530f0e95ad581546a5ae9eaa2846 /rules
parent448b981844da83c98d378448c063a0c11e7ff839 (diff)
downloadhaskell-c548fec4f11920244e81b9f83ebb2aaf7d08ba40.tar.gz
Change the ranlib detection
On Windows, the ranlib in the path may not be the right ranlib (it may be the 32bit ranlib when we are making a Win64 compiler, or vice-versa). Therefore we can't leave it up to libffi to detect the right ranlib, but need to tell it which ranlib to use. This means that we need to find ranlib even if we don't actually need it ourselves.
Diffstat (limited to 'rules')
-rw-r--r--rules/build-package-data.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 24299426e5..82a2535844 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -86,7 +86,7 @@ endif
$1_$2_CONFIGURE_OPTS += --configure-option=--with-cc="$$(CC_STAGE$3)"
$1_$2_CONFIGURE_OPTS += --with-ar="$$(AR_STAGE$3)"
-$1_$2_CONFIGURE_OPTS += --with-ranlib="$$(RANLIB)"
+$1_$2_CONFIGURE_OPTS += --with-ranlib="$$(REAL_RANLIB_CMD)"
$1_$2_CONFIGURE_OPTS += $$(if $$(ALEX),--with-alex="$$(ALEX)")
$1_$2_CONFIGURE_OPTS += $$(if $$(HAPPY),--with-happy="$$(HAPPY)")