diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-08-09 22:46:26 +0800 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-08-18 05:43:57 -0400 |
| commit | 0ba21dbe28882d506c3536c40224ebff337a9f49 (patch) | |
| tree | 416e9390dbd1db7728ee0239e3432b0ba481cc35 /testsuite/tests/driver | |
| parent | 5798357d9396c62a07413b1ee8ab3515526cf1e7 (diff) | |
| download | haskell-0ba21dbe28882d506c3536c40224ebff337a9f49.tar.gz | |
Fix parsing of rpaths which include spaces in runInjectRPaths
The logic didn't account for the fact that the paths could contain
spaces before which led to errors such as the following from
install_name_tool.
Stderr ( T14304 ):
Warning: -rtsopts and -with-rtsopts have no effect with -shared.
Call hs_init_ghc() from your main() function to set these options.
error: /nix/store/a6j5761iy238pbckxq2xrhqr2d5kra4m-cctools-binutils-darwin-949.0.1/bin/install_name_tool: for: dist/build/libHSp-0.1-ghc8.10.6.dylib (for architecture arm64) option "-add_rpath /Users/matt/ghc/bindisttest/install dir/lib/ghc-8.10.6/ghc-prim-0.6.1" would duplicate path, file already has LC_RPATH for: /Users/matt/ghc/bindisttest/install dir/lib/ghc-8.10.6/ghc-prim-0.6.1
`install_name_tool' failed in phase `Install Name Tool'. (Exit code: 1)
Fixes #20212
This apparently also fixes #20026, which is a nice surprise.
Diffstat (limited to 'testsuite/tests/driver')
| -rw-r--r-- | testsuite/tests/driver/T3007/all.T | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/testsuite/tests/driver/T3007/all.T b/testsuite/tests/driver/T3007/all.T index be57f45807..d0442712e9 100644 --- a/testsuite/tests/driver/T3007/all.T +++ b/testsuite/tests/driver/T3007/all.T @@ -1,4 +1,3 @@ test('T3007', - [when(opsys('darwin'), expect_broken(20026)), - extra_files(['A/', 'B/'])], + [extra_files(['A/', 'B/'])], makefile_test, []) |