Skip to content

Commit bf32602

Browse files
nh2alexbiehl
nh2
authored and
alexbiehl
committed
Add field to to remember libs needed for fully static linking
* WIP: Still need to update ghc to use the new `libraryDirsStatic` and `extraLibrariesStatic` fields in `InstalledPackageInfo` for linking. * WIP: Adding -L paths to .a libs in .conf files will likely increase nix closure size for dynamically linked Haskell packages because if pkg-config finds an `-a` file, the path to it will be remembered. (That only has an impact if the .a file is in a split-output from the .so file.) Perhaps we make the feature that `pkg-config --static` is called opt-outable. On the other hand Haskell libs always carry their .a files, so pulling a few system `.a` files more shouldn't make much of a difference. So this opt-out should probably be an extra feature for later, if at all.
1 parent 261f14f commit bf32602

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+399
-36
lines changed

‎Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ GenericPackageDescription
4444
extraFrameworkDirs = [],
4545
extraGHCiLibs = [],
4646
extraLibDirs = [],
47+
extraLibDirsStatic = [],
4748
extraLibFlavours = [],
4849
extraLibs = [],
50+
extraLibsStatic = [],
4951
frameworks = [],
5052
hsSourceDirs = [],
5153
hsc2hsOptions = [],
@@ -140,8 +142,10 @@ GenericPackageDescription
140142
extraFrameworkDirs = [],
141143
extraGHCiLibs = [],
142144
extraLibDirs = [],
145+
extraLibDirsStatic = [],
143146
extraLibFlavours = [],
144147
extraLibs = [],
148+
extraLibsStatic = [],
145149
frameworks = [],
146150
hsSourceDirs = [],
147151
hsc2hsOptions = [],
@@ -245,8 +249,10 @@ GenericPackageDescription
245249
extraFrameworkDirs = [],
246250
extraGHCiLibs = [],
247251
extraLibDirs = [],
252+
extraLibDirsStatic = [],
248253
extraLibFlavours = [],
249254
extraLibs = [],
255+
extraLibsStatic = [],
250256
frameworks = [],
251257
hsSourceDirs = [],
252258
hsc2hsOptions = [],

‎Cabal-tests/tests/ParserTests/regressions/common-conditional.expr

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ GenericPackageDescription
4545
extraFrameworkDirs = [],
4646
extraGHCiLibs = [],
4747
extraLibDirs = [],
48+
extraLibDirsStatic = [],
4849
extraLibFlavours = [],
4950
extraLibs = [],
51+
extraLibsStatic = [],
5052
frameworks = [],
5153
hsSourceDirs = [],
5254
hsc2hsOptions = [],
@@ -131,8 +133,10 @@ GenericPackageDescription
131133
extraFrameworkDirs = [],
132134
extraGHCiLibs = [],
133135
extraLibDirs = [],
136+
extraLibDirsStatic = [],
134137
extraLibFlavours = [],
135138
extraLibs = [],
139+
extraLibsStatic = [],
136140
frameworks = [],
137141
hsSourceDirs = [],
138142
hsc2hsOptions = [],
@@ -214,8 +218,10 @@ GenericPackageDescription
214218
extraFrameworkDirs = [],
215219
extraGHCiLibs = [],
216220
extraLibDirs = [],
221+
extraLibDirsStatic = [],
217222
extraLibFlavours = [],
218223
extraLibs = [],
224+
extraLibsStatic = [],
219225
frameworks = [],
220226
hsSourceDirs = [],
221227
hsc2hsOptions = [],
@@ -281,8 +287,10 @@ GenericPackageDescription
281287
extraFrameworkDirs = [],
282288
extraGHCiLibs = [],
283289
extraLibDirs = [],
290+
extraLibDirsStatic = [],
284291
extraLibFlavours = [],
285292
extraLibs = [],
293+
extraLibsStatic = [],
286294
frameworks = [],
287295
hsSourceDirs = [],
288296
hsc2hsOptions = [],
@@ -358,8 +366,10 @@ GenericPackageDescription
358366
extraFrameworkDirs = [],
359367
extraGHCiLibs = [],
360368
extraLibDirs = [],
369+
extraLibDirsStatic = [],
361370
extraLibFlavours = [],
362371
extraLibs = [],
372+
extraLibsStatic = [],
363373
frameworks = [],
364374
hsSourceDirs = [],
365375
hsc2hsOptions = [],
@@ -437,8 +447,10 @@ GenericPackageDescription
437447
extraFrameworkDirs = [],
438448
extraGHCiLibs = [],
439449
extraLibDirs = [],
450+
extraLibDirsStatic = [],
440451
extraLibFlavours = [],
441452
extraLibs = [],
453+
extraLibsStatic = [],
442454
frameworks = [],
443455
hsSourceDirs = [],
444456
hsc2hsOptions = [],
@@ -524,8 +536,10 @@ GenericPackageDescription
524536
extraFrameworkDirs = [],
525537
extraGHCiLibs = [],
526538
extraLibDirs = [],
539+
extraLibDirsStatic = [],
527540
extraLibFlavours = [],
528541
extraLibs = [],
542+
extraLibsStatic = [],
529543
frameworks = [],
530544
hsSourceDirs = [],
531545
hsc2hsOptions = [],
@@ -608,8 +622,10 @@ GenericPackageDescription
608622
extraFrameworkDirs = [],
609623
extraGHCiLibs = [],
610624
extraLibDirs = [],
625+
extraLibDirsStatic = [],
611626
extraLibFlavours = [],
612627
extraLibs = [],
628+
extraLibsStatic = [],
613629
frameworks = [],
614630
hsSourceDirs = [],
615631
hsc2hsOptions = [],

‎Cabal-tests/tests/ParserTests/regressions/common.expr

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ GenericPackageDescription
3434
extraFrameworkDirs = [],
3535
extraGHCiLibs = [],
3636
extraLibDirs = [],
37+
extraLibDirsStatic = [],
3738
extraLibFlavours = [],
3839
extraLibs = [],
40+
extraLibsStatic = [],
3941
frameworks = [],
4042
hsSourceDirs = [],
4143
hsc2hsOptions = [],
@@ -100,8 +102,10 @@ GenericPackageDescription
100102
extraFrameworkDirs = [],
101103
extraGHCiLibs = [],
102104
extraLibDirs = [],
105+
extraLibDirsStatic = [],
103106
extraLibFlavours = [],
104107
extraLibs = [],
108+
extraLibsStatic = [],
105109
frameworks = [],
106110
hsSourceDirs = [],
107111
hsc2hsOptions = [],

0 commit comments

Comments
 (0)