Merge branch 'staging' into upstream-wasm-cross-nixpkgs-4

This commit is contained in:
Divam Narula
2020-08-16 10:13:57 +05:30
committed by GitHub
1494 changed files with 29457 additions and 14355 deletions
+2 -2
View File
@@ -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