summaryrefslogtreecommitdiff
path: root/p/ghc
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2014-12-01 11:41:16 +0300
committerJoachim Breitner <mail@joachim-breitner.de>2014-12-01 11:41:16 +0300
commitbf2076d4125a579e917db75dbffa022de9c9cdcc (patch)
tree8a3617d6b12651c5ec7c5766fa17c0d31c82a4de /p/ghc
parent7380a91039af4a5773b1e2e81c5a9d14c63cf9f0 (diff)
downloadDHG_packages-bf2076d4125a579e917db75dbffa022de9c9cdcc.tar.gz
ghc: Do not pass -mlong-calls to gcc on arm, on the grounds that upstream is not doing it.
Diffstat (limited to 'p/ghc')
-rw-r--r--p/ghc/debian/changelog3
-rwxr-xr-xp/ghc/debian/rules3
2 files changed, 2 insertions, 4 deletions
diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index c48e37d87..ac9973ba2 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,7 +1,8 @@
ghc (7.8.20141119-6) UNRELEASED; urgency=medium
- * Do not pass -mlong-calls to gcc on arm64.
* According to Ben Gamari, the flag is -optl-B..., not -optc-B...
+ * Do not pass -mlong-calls to gcc on arm, on the grounds that upstream is
+ not doing it.
-- Joachim Breitner <nomeata@debian.org> Sun, 30 Nov 2014 22:17:39 +0100
diff --git a/p/ghc/debian/rules b/p/ghc/debian/rules
index e2f20d359..90b5ba66f 100755
--- a/p/ghc/debian/rules
+++ b/p/ghc/debian/rules
@@ -61,9 +61,6 @@ configure-stamp:
echo "SRC_HC_OPTS += -lffi -optl-pthread" >> mk/build.mk
echo "HADDOCK_DOCS := YES" >> mk/build.mk
echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
-ifneq (,$(findstring $(DEB_HOST_ARCH), armel armhf))
- echo "SRC_HC_OPTS += -optc-mlong-calls" >> mk/build.mk
-endif
ifneq (,$(findstring $(DEB_HOST_ARCH), arm64 armel armhf))
echo "SRC_HC_OPTS += -optl-B/usr/bin/ld.gold" >> mk/build.mk
endif