Merge #95089: glibc: 2.31 -> 2.32 (into staging)

2020-09-13 08:26:14 +02:00
parent 6705f79d42 25e60944c6
commit e78b52ede7
50 changed files with 582 additions and 234 deletions
@@ -245,6 +245,10 @@ stdenv.mkDerivation {
      --replace usr "$PREFIX"
    substituteInPlace swift-corelibs-xctest/build_script.py \
      --replace usr "$PREFIX"
+    substituteInPlace swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c \
+      --replace "if !TARGET_OS_ANDROID" "if TARGET_OS_MAC || TARGET_OS_BSD"
+    substituteInPlace swift-corelibs-foundation/CoreFoundation/PlugIn.subproj/CFBundle_Resources.c \
+      --replace "if !TARGET_OS_ANDROID" "if TARGET_OS_MAC || TARGET_OS_BSD"
  '';

  configurePhase = ''