Merge branch 'staging' into upstream-wasm-cross-nixpkgs-4
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
|
||||
|
||||
# aarch64 outputs otherwise exceed 2GB limit
|
||||
, enableProfiliedLibs ? !stdenv.targetPlatform.isAarch64
|
||||
, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64
|
||||
|
||||
, # Whether to build dynamic libs for the standard library (on the target
|
||||
# platform). Static libs are always built.
|
||||
@@ -70,7 +70,7 @@ let
|
||||
BUILD_SPHINX_PDF = NO
|
||||
'' + stdenv.lib.optionalString dontStrip ''
|
||||
STRIP_CMD = :
|
||||
'' + stdenv.lib.optionalString (!enableProfiliedLibs) ''
|
||||
'' + stdenv.lib.optionalString (!enableProfiledLibs) ''
|
||||
GhcLibWays = "v dyn"
|
||||
'' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
|
||||
GhcLibHcOpts += -fPIC
|
||||
|
||||
Reference in New Issue
Block a user