Merge branch 'master' into staging-next

2020-07-23 08:19:14 +02:00
parent 19be541fe7 ce55b09ad5
commit 2988feba8c
80 changed files with 6012 additions and 1881 deletions
@@ -90,7 +90,7 @@ in stdenv.mkDerivation rec {
    "${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config"
    "${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config"
    "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config"
-  ] ++ optionals stdenv.isLinux [
+  ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [
    "--enable-profiler" # build libprofiler_builtins
  ];