File tree Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Expand file tree Collapse file tree 1 file changed +4
-3
lines changed Original file line number Diff line number Diff line change 23
23
24
24
exeExt = stdenv . hostPlatform . extensions . executable ;
25
25
crossSuffix = lib . optionalString ( stdenv . hostPlatform != stdenv . buildPlatform ) "-${ stdenv . hostPlatform . config } " ;
26
+ crossSuffix' = lib . optionalString ( stdenv . hostPlatform != stdenv . buildPlatform && stdenv . hostPlatform . isStatic ) "-static-${ stdenv . hostPlatform . config } " ;
26
27
27
28
in recurseIntoAttrs ( {
28
29
# Does not work on ghcjs because it needs zlib.
@@ -91,7 +92,7 @@ in recurseIntoAttrs ({
91
92
dirExists "$pkga_basedir/html/pkga-0.1.0.0"
92
93
93
94
pkgb_basedir="${ project . hsPkgs . pkgb . coverageReport } /share/hpc/vanilla"
94
- testTix="$pkgb_basedir/tix/pkgb-test-tests${ crossSuffix } -0.1.0.0-check${ crossSuffix } /tests${ exeExt } .tix"
95
+ testTix="$pkgb_basedir/tix/pkgb-test-tests${ crossSuffix' } -0.1.0.0-check${ crossSuffix } /tests${ exeExt } .tix"
95
96
libTix="$pkgb_basedir/tix/pkgb-0.1.0.0/pkgb-0.1.0.0.tix"
96
97
fileExistsNonEmpty "$testTix"
97
98
fileExistsNonEmpty "$libTix"
@@ -118,8 +119,8 @@ in recurseIntoAttrs ({
118
119
dirExists "$project_basedir/tix/pkga-0.1.0.0${ inplaceSuffix } "
119
120
dirExists "$project_basedir/tix/pkgb-0.1.0.0${ inplaceSuffix } "
120
121
fileExistsNonEmpty "$project_basedir/tix/pkgb-0.1.0.0${ inplaceSuffix } /pkgb-0.1.0.0${ inplaceSuffix } .tix"
121
- dirExists "$project_basedir/tix/pkgb-test-tests${ crossSuffix } -0.1.0.0-check${ crossSuffix } "
122
- fileExistsNonEmpty "$project_basedir/tix/pkgb-test-tests${ crossSuffix } -0.1.0.0-check${ crossSuffix } /tests${ exeExt } .tix"
122
+ dirExists "$project_basedir/tix/pkgb-test-tests${ crossSuffix' } -0.1.0.0-check${ crossSuffix } "
123
+ fileExistsNonEmpty "$project_basedir/tix/pkgb-test-tests${ crossSuffix' } -0.1.0.0-check${ crossSuffix } /tests${ exeExt } .tix"
123
124
'' ;
124
125
in ''
125
126
${ check cabalProj "-inplace" }
You can’t perform that action at this time.
0 commit comments