diff options
| author | Maxim Ivanov <ulidtko@gmail.com> | 2018-03-17 18:38:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-17 18:38:48 +0200 |
| commit | 0d05f81305d4bd16bc647f6d60017fdb10d9cfb3 (patch) | |
| tree | 1f62875712a0daefc4e0e9a27ac801d20a79265b /src/CabalHelper | |
| parent | b81f78ab5008506ebefa75d6d8aa512e4e7a378e (diff) | |
| parent | 3051ea520c3164f5f9483d497adc79be23a15cbb (diff) | |
Merge pull request #48 from ulidtko/fix-componentOutDir-cabal2.0
Fix inverted Cabal2.0 version check; fix cabal-preprocessors test
Diffstat (limited to 'src/CabalHelper')
| -rw-r--r-- | src/CabalHelper/Runtime/Main.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CabalHelper/Runtime/Main.hs b/src/CabalHelper/Runtime/Main.hs index 48d134a..3846d49 100644 --- a/src/CabalHelper/Runtime/Main.hs +++ b/src/CabalHelper/Runtime/Main.hs @@ -500,9 +500,9 @@ componentOptions' (lbi, v, distdir) inplaceFlag flags rf f = do componentsMap lbi v distdir $ \c clbi bi -> let #if CH_MIN_VERSION_Cabal(2,0,0) - outdir = componentBuildDir lbi clbi -#else outdir = componentOutDir lbi c +#else + outdir = componentBuildDir lbi clbi #endif (clbi', adopts) = case flags of _ | not inplaceFlag -> (clbi, mempty) |