petersen pushed to ghc (f22). "use llvm for aarch64 and fix build.mk BuildFlavour setup"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Mar 30 15:27:05 UTC 2015


>From 25a760a22fe3cd80efe33646f4b00a6c330ebc3c Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen at fedoraproject.org>
Date: Sun, 1 Mar 2015 19:57:53 +0900
Subject: use llvm for aarch64 and fix build.mk BuildFlavour setup


diff --git a/ghc.spec b/ghc.spec
index c02f355..9a2efd3 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -123,6 +123,9 @@ BuildRequires: python
 %ifarch armv7hl armv5tel
 BuildRequires: llvm34
 %endif
+%ifarch aarch64
+BuildRequires: llvm
+%endif
 %ifarch armv7hl aarch64
 # patch22 and patch24
 BuildRequires: autoconf, automake
@@ -292,13 +295,13 @@ fi
 # cf https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-lang/ghc
 cat > mk/build.mk << EOF
 %if %{undefined ghc_bootstrapping}
-%ifnarch armv7hl armv5tel
-BuildFlavour = perf
-%else
+%ifarch armv7hl armv5tel aarch64
 BuildFlavour = perf-llvm
+%else
+BuildFlavour = perf
 %endif
 %else
-%ifnarch armv7hl armv5tel
+%ifarch armv7hl armv5tel aarch64
 BuildFlavour = quick-llvm
 %else
 BuildFlavour = quick
@@ -553,6 +556,10 @@ fi
 
 
 %changelog
+* Sun Mar  1 2015 Jens Petersen <petersen at fedoraproject.org>
+- use llvm for aarch64
+- fix build.mk BuildFlavour setup
+
 * Sat Feb 14 2015 Jens Petersen <petersen at redhat.com> - 7.8.4-42
 - try "make -j16" on Intel arches to keep ABI hashes same as -40
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ghc.git/commit/?h=f22&id=25a760a22fe3cd80efe33646f4b00a6c330ebc3c


More information about the scm-commits mailing list