swiftpm: force-unwrap file handles in swift-tools-support-core
This commit is contained in:
parent
e5d7fa1eae
commit
56aa31d0b4
@ -199,6 +199,10 @@ let
|
||||
name = "swift-tools-support-core";
|
||||
src = generated.sources.swift-tools-support-core;
|
||||
|
||||
patches = [
|
||||
./patches/force-unwrap-file-handles.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
swift-system
|
||||
sqlite
|
||||
@ -385,6 +389,7 @@ in stdenv.mkDerivation (commonAttrs // {
|
||||
swiftpmMakeMutable swift-tools-support-core
|
||||
substituteInPlace .build/checkouts/swift-tools-support-core/Sources/TSCTestSupport/XCTestCasePerf.swift \
|
||||
--replace 'canImport(Darwin)' 'false'
|
||||
patch -p1 -d .build/checkouts/swift-tools-support-core -i ${./patches/force-unwrap-file-handles.patch}
|
||||
|
||||
# Prevent a warning about SDK directories we don't have.
|
||||
swiftpmMakeMutable swift-driver
|
||||
|
@ -0,0 +1,33 @@
|
||||
From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001
|
||||
From: Pavel Sobolev <paveloom@riseup.net>
|
||||
Date: Tue, 21 Nov 2023 20:53:33 +0300
|
||||
Subject: [PATCH] Force-unwrap file handles.
|
||||
|
||||
---
|
||||
Sources/TSCBasic/FileSystem.swift | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift
|
||||
index 3a63bdf..a1f3d9d 100644
|
||||
--- a/Sources/TSCBasic/FileSystem.swift
|
||||
+++ b/Sources/TSCBasic/FileSystem.swift
|
||||
@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem {
|
||||
if fp == nil {
|
||||
throw FileSystemError(errno: errno, path)
|
||||
}
|
||||
- defer { fclose(fp) }
|
||||
+ defer { fclose(fp!) }
|
||||
|
||||
// Read the data one block at a time.
|
||||
let data = BufferedOutputByteStream()
|
||||
@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem {
|
||||
if fp == nil {
|
||||
throw FileSystemError(errno: errno, path)
|
||||
}
|
||||
- defer { fclose(fp) }
|
||||
+ defer { fclose(fp!) }
|
||||
|
||||
// Write the data in one chunk.
|
||||
var contents = bytes.contents
|
||||
--
|
||||
2.42.0
|
Loading…
Reference in New Issue
Block a user