diff options
Diffstat (limited to 'hadrian/src')
-rwxr-xr-x | hadrian/src/Settings.hs | 11 | ||||
-rw-r--r-- | hadrian/src/Settings/Flavours/Llvm.hs | 25 | ||||
-rw-r--r-- | hadrian/src/Settings/Flavours/Profiled.hs | 22 | ||||
-rw-r--r-- | hadrian/src/Settings/Flavours/ThreadSanitizer.hs | 9 |
4 files changed, 3 insertions, 64 deletions
diff --git a/hadrian/src/Settings.hs b/hadrian/src/Settings.hs index 43af1330ca..23f2708b9f 100755 --- a/hadrian/src/Settings.hs +++ b/hadrian/src/Settings.hs @@ -15,13 +15,10 @@ import {-# SOURCE #-} Settings.Default import Settings.Flavours.Benchmark import Settings.Flavours.Development import Settings.Flavours.GhcInGhci -import Settings.Flavours.Llvm import Settings.Flavours.Performance -import Settings.Flavours.Profiled import Settings.Flavours.Quick import Settings.Flavours.Quickest import Settings.Flavours.QuickCross -import Settings.Flavours.ThreadSanitizer import Settings.Flavours.Validate import Control.Monad.Except @@ -54,13 +51,11 @@ stagePackages stage = do hadrianFlavours :: [Flavour] hadrianFlavours = [ benchmarkFlavour, defaultFlavour, developmentFlavour Stage1 - , developmentFlavour Stage2, performanceFlavour, profiledFlavour + , developmentFlavour Stage2, performanceFlavour , quickFlavour, quickValidateFlavour, quickDebugFlavour , quickestFlavour - , quickCrossFlavour, benchmarkLlvmFlavour - , performanceLlvmFlavour, profiledLlvmFlavour, quickLlvmFlavour - , ghcInGhciFlavour, validateFlavour, slowValidateFlavour - , threadSanitizerFlavour ] + , quickCrossFlavour + , ghcInGhciFlavour, validateFlavour, slowValidateFlavour ] -- | This action looks up a flavour with the name given on the -- command line with @--flavour@, defaulting to 'userDefaultFlavour' diff --git a/hadrian/src/Settings/Flavours/Llvm.hs b/hadrian/src/Settings/Flavours/Llvm.hs deleted file mode 100644 index 3882e73f45..0000000000 --- a/hadrian/src/Settings/Flavours/Llvm.hs +++ /dev/null @@ -1,25 +0,0 @@ -module Settings.Flavours.Llvm ( - benchmarkLlvmFlavour, - performanceLlvmFlavour, - profiledLlvmFlavour, - quickLlvmFlavour, -) where - -import Flavour - -import Settings.Flavours.Benchmark -import Settings.Flavours.Performance -import Settings.Flavours.Profiled -import Settings.Flavours.Quick - --- Please update doc/flavours.md when changing this file. -benchmarkLlvmFlavour, performanceLlvmFlavour, profiledLlvmFlavour, quickLlvmFlavour :: Flavour -benchmarkLlvmFlavour = mkLlvmFlavour benchmarkFlavour -performanceLlvmFlavour = mkLlvmFlavour performanceFlavour -profiledLlvmFlavour = mkLlvmFlavour profiledFlavour -quickLlvmFlavour = mkLlvmFlavour quickFlavour - --- | Turn a flavour into an LLVM flavour -mkLlvmFlavour :: Flavour -> Flavour -mkLlvmFlavour flav = viaLlvmBackend $ flav - { name = name flav ++ "-llvm" } diff --git a/hadrian/src/Settings/Flavours/Profiled.hs b/hadrian/src/Settings/Flavours/Profiled.hs deleted file mode 100644 index 49339f1446..0000000000 --- a/hadrian/src/Settings/Flavours/Profiled.hs +++ /dev/null @@ -1,22 +0,0 @@ -module Settings.Flavours.Profiled (profiledFlavour) where - -import Expression -import Flavour -import {-# SOURCE #-} Settings.Default - --- Please update doc/flavours.md when changing this file. -profiledFlavour :: Flavour -profiledFlavour = defaultFlavour - { name = "prof" - , args = defaultBuilderArgs <> profiledArgs <> defaultPackageArgs - , ghcProfiled = True - , dynamicGhcPrograms = pure False } - -profiledArgs :: Args -profiledArgs = sourceArgs SourceArgs - { hsDefault = mconcat - [ pure ["-O0", "-H64m"] - ] - , hsLibrary = notStage0 ? arg "-O" - , hsCompiler = mconcat [stage0 ? arg "-O2", notStage0 ? arg "-O"] - , hsGhc = arg "-O" } diff --git a/hadrian/src/Settings/Flavours/ThreadSanitizer.hs b/hadrian/src/Settings/Flavours/ThreadSanitizer.hs deleted file mode 100644 index 722370f5cd..0000000000 --- a/hadrian/src/Settings/Flavours/ThreadSanitizer.hs +++ /dev/null @@ -1,9 +0,0 @@ -module Settings.Flavours.ThreadSanitizer (threadSanitizerFlavour) where - -import Flavour -import Settings.Flavours.Validate - -threadSanitizerFlavour :: Flavour -threadSanitizerFlavour = - enableThreadSanitizer (validateFlavour - { name = "thread-sanitizer" }) |