From 5672626a8e9e13f544989f77e2f7ad953d30c526 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 17 May 2013 13:16:21 -0400 Subject: fixes --- standalone/windows/build.sh | 2 +- ....0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'standalone') diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index fd833d830..ec3efeeb8 100644 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -25,7 +25,7 @@ rm -rf MissingH-1.2.0.0 cabal unpack MissingH cd MissingH-1.2.0.0 incygwin patch -p1 <../standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch -cabal install --reinstall +cabal install || true cd .. cabal install --only-dependencies -f"$FLAGS" diff --git a/standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch b/standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch index 72aa54e00..be18ff23f 100644 --- a/standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch +++ b/standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch @@ -38,8 +38,8 @@ index 473490d..0eea21b 100644 - accessTime = fromInteger epochtime, - modificationTime = fromInteger epochtime, - statusChangeTime = fromInteger epochtime -+ accessTime = undefined -- fromInteger epochtime, -+ modificationTime = undefined -- fromInteger epochtime, ++ accessTime = undefined, -- fromInteger epochtime, ++ modificationTime = undefined, -- fromInteger epochtime, + statusChangeTime = undefined -- fromInteger epochtime } #endif -- cgit v1.2.3