summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2018-10-05 12:26:50 -0400
committerJoey Hess2018-10-05 12:26:50 -0400
commit51637d5a96b9dc0f811a62ba7b4dcabd14cfc329 (patch)
tree8ad587c82ac9d2930b134fccc2a0abdf9f9293d6 /src/Propellor
parent5227c25ce0116102a3075daaf0adc74ee371eb67 (diff)
minor improvement to stack and cabal setup
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 969a0dc7..7984a2aa 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -160,6 +160,12 @@ stackInstalled = withOS "stack installed" $ \w o ->
`assume` MadeChange
& cmdProperty "rm" ["-rf", tmpdir, tmptar]
`assume` MadeChange
+ & case arch of
+ ARMEL -> setupRevertableProperty $
+ "/lib/ld-linux-armhf.so.3"
+ `File.isSymlinkedTo`
+ File.LinkTarget "/lib/ld-linux.so.3"
+ _ -> doNothing
where
url = case arch of
X86_32 -> "https://www.stackage.org/stack/linux-i386"
@@ -177,7 +183,7 @@ armAutoBuilder baseautobuilder suite arch flavor =
& baseautobuilder suite arch flavor
-- Works around ghc crash with parallel builds on arm.
& (homedir </> ".cabal" </> "config")
- `File.lacksLine` "jobs: $ncpus"
+ `File.containsLine` "jobs: 1"
-- Work around https://github.com/systemd/systemd/issues/7135
& Systemd.containerCfg "--system-call-filter=set_tls"