summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsheaf <sam.derbyshire@gmail.com>2022-05-24 18:17:58 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-05-24 22:15:12 -0400
commitcfb9faff791064fab1b308b08b6ec1be288a4675 (patch)
tree9d0b04174573d1a2651dc679b9011ef358fc6c84
parent2c25fff6622cdb07b681cebde7890172f7c9e44f (diff)
downloadhaskell-cfb9faff791064fab1b308b08b6ec1be288a4675.tar.gz
Hadrian: don't add "lib" for relocatable builds
The conditional in hadrian/bindist/Makefile depended on the target OS, but it makes more sense to use whether we are using a relocatable build. (Currently this only gets set to true on Windows, but this ensures that the logic stays correctly coupled.)
-rw-r--r--hadrian/bindist/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile
index fb1c5dadfc..40efe553c1 100644
--- a/hadrian/bindist/Makefile
+++ b/hadrian/bindist/Makefile
@@ -91,7 +91,7 @@ install: install_bin install_lib install_includes
install: install_docs update_package_db
ActualBinsDir=${ghclibdir}/bin
-ifeq "$(TargetOS_CPP)" "mingw32"
+ifeq "$(RelocatableBuild)" "YES"
ActualLibsDir=${ghclibdir}
else
ActualLibsDir=${ghclibdir}/lib