Merge pull request #42050 from obsidiansystems/fix-ios-ghc
ghc8.4: build statically on prebuilt iOS
This commit is contained in:
commit
493ce3b2c4
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
, # Whether to build dynamic libs for the standard library (on the target
|
, # Whether to build dynamic libs for the standard library (on the target
|
||||||
# platform). Static libs are always built.
|
# platform). Static libs are always built.
|
||||||
enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
|
enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt
|
||||||
|
|
||||||
, # Whetherto build terminfo.
|
, # Whetherto build terminfo.
|
||||||
enableTerminfo ? !targetPlatform.isWindows
|
enableTerminfo ? !targetPlatform.isWindows
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
, # Whether to build dynamic libs for the standard library (on the target
|
, # Whether to build dynamic libs for the standard library (on the target
|
||||||
# platform). Static libs are always built.
|
# platform). Static libs are always built.
|
||||||
enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
|
enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt
|
||||||
|
|
||||||
, # Whetherto build terminfo.
|
, # Whetherto build terminfo.
|
||||||
enableTerminfo ? !targetPlatform.isWindows
|
enableTerminfo ? !targetPlatform.isWindows
|
||||||
|
|
Loading…
Reference in New Issue