Commit e5f2754c authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺 Committed by GitHub
Browse files

Merge pull request #4773 from hvr/pr/comp-distdir

Differentiate letter for the dist-dir layout of components
parents e63c0f3a e2a52dee
......@@ -185,10 +185,14 @@ defaultDistDirLayout projectRoot mdistDirectory =
display (distParamPlatform params) </>
display (distParamCompilerId params) </>
display (distParamPackageId params) </>
(case fmap componentNameString (distParamComponentName params) of
Nothing -> ""
Just Nothing -> ""
Just (Just name) -> "c" </> display name) </>
(case distParamComponentName params of
Nothing -> ""
Just CLibName -> ""
Just (CSubLibName name) -> "l" </> display name
Just (CFLibName name) -> "f" </> display name
Just (CExeName name) -> "x" </> display name
Just (CTestName name) -> "t" </> display name
Just (CBenchName name) -> "b" </> display name) </>
(case distParamOptimization params of
NoOptimisation -> "noopt"
NormalOptimisation -> ""
......
......@@ -18,6 +18,8 @@
* On macOS, `new-build` will now place dynamic libraries into
`store/lib` and aggressively shorten their names in an effort to
stay within the load command size limits of macOSs mach-o linker.
* Use [lfxtb] letters to differentiate component kind instead of
opaque "c" in dist-dir layout.
2.0.0.1 Mikhail Glushenkov <mikhail.glushenkov@gmail.com> TBD 2017
* Support for GHC's numeric -g debug levels (#4673).
......
......@@ -14,7 +14,7 @@ Building test suite 'test-Short' for my-0.1..
Running 1 test suites...
Test suite test-Short: RUNNING...
Test suite test-Short: PASS
Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/my-0.1/c/test-Short/test/my-0.1-test-Short.log
Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/my-0.1/t/test-Short/test/my-0.1-test-Short.log
1 of 1 test suites (1 of 1 test cases) passed.
Configuring test suite 'test-Foo' for my-0.1..
Preprocessing test suite 'test-Foo' for my-0.1..
......@@ -22,5 +22,5 @@ Building test suite 'test-Foo' for my-0.1..
Running 1 test suites...
Test suite test-Foo: RUNNING...
Test suite test-Foo: PASS
Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/my-0.1/c/test-Foo/test/my-0.1-test-Foo.log
Test suite logged to: <ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/my-0.1/t/test-Foo/test/my-0.1-test-Foo.log
1 of 1 test suites (1 of 1 test cases) passed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment