diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2018-03-17 18:50:29 +0100 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2018-03-17 18:50:29 +0100 |
| commit | 63e1401b49eea94bc61127d79ed5406604bfbbfe (patch) | |
| tree | 36b09984da0a060d15cb406c8c099d738fe218b3 /src/CabalHelper/Runtime/Main.hs | |
| parent | 0d05f81305d4bd16bc647f6d60017fdb10d9cfb3 (diff) | |
Revert "Merge pull request #48 from ulidtko/fix-componentOutDir-cabal2.0"
This reverts commit 0d05f81305d4bd16bc647f6d60017fdb10d9cfb3, reversing
changes made to b81f78ab5008506ebefa75d6d8aa512e4e7a378e.
Diffstat (limited to 'src/CabalHelper/Runtime/Main.hs')
| -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 3846d49..48d134a 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 = componentOutDir lbi c -#else outdir = componentBuildDir lbi clbi +#else + outdir = componentOutDir lbi c #endif (clbi', adopts) = case flags of _ | not inplaceFlag -> (clbi, mempty) |