diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2014-11-30 20:51:40 +0300 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2014-11-30 20:51:40 +0300 |
| commit | d2e694e7a931965a31ae49ec8b51cac470f1a615 (patch) | |
| tree | 41f67843f482d20d2487f4fbeca8d0b889e28fa5 /p/ghc | |
| parent | c35cf5f2dd4cb9cf2bcb3ca2da22a25258353c01 (diff) | |
| download | DHG_packages-d2e694e7a931965a31ae49ec8b51cac470f1a615.tar.gz | |
ghc: Try using ld.gold on arm, using -optc-B/usr/bin/ld.gold
Diffstat (limited to 'p/ghc')
| -rw-r--r-- | p/ghc/debian/changelog | 6 | ||||
| -rwxr-xr-x | p/ghc/debian/rules | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog index bcced3c0b..f40c153a5 100644 --- a/p/ghc/debian/changelog +++ b/p/ghc/debian/changelog @@ -1,3 +1,9 @@ +ghc (7.8.20141119-5) UNRELEASED; urgency=medium + + * Try using ld.gold on arm, using -optc-B/usr/bin/ld.gold + + -- Joachim Breitner <nomeata@debian.org> Sun, 30 Nov 2014 18:51:25 +0100 + ghc (7.8.20141119-4) experimental; urgency=medium * Try using ld.gold on arm. diff --git a/p/ghc/debian/rules b/p/ghc/debian/rules index fab972ce5..65e01d6c7 100755 --- a/p/ghc/debian/rules +++ b/p/ghc/debian/rules @@ -42,12 +42,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif -ifneq (,$(findstring $(DEB_HOST_ARCH),arm64 armel armhf)) - LINKER = ld.gold -else - LINKER = ld.bfd -endif - autoreconf: autoreconf -fi @@ -67,8 +61,9 @@ 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), arm armel armhf)) +ifneq (,$(findstring $(DEB_HOST_ARCH), arm64 armel armhf)) echo "SRC_HC_OPTS += -optc-mlong-calls" >> mk/build.mk + echo "SRC_HC_OPTS += -optc-B/usr/bin/ld.gold" >> mk/build.mk endif ifeq (armhf,$(DEB_HOST_ARCH)) echo "SRC_HC_OPTS += -D__ARM_PCS_VFP" >> mk/build.mk @@ -121,7 +116,6 @@ endif ./configure $(confflags) --prefix=/usr \ $(EXTRA_CONFIGURE_FLAGS) \ --with-system-libffi \ - --with-ld=$(LINKER) \ --with-llc=llc-3.4 \ --with-opt=opt-3.4 |