Skip to content

Commit 56a89f5

Browse files
[ABIChecking] Use -Isystem and -Fsystem for swift-api-digester
swift-api-digester is changing to use the Swift -Fsystem flag instead of the clang -iframework flag. It never supported the clang -isystem flag, but it now supports the Swift -Isystem flag. rdar://152747553
1 parent d2236ee commit 56a89f5

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

Sources/SwiftDriver/Jobs/APIDigesterJobs.swift

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,16 +193,8 @@ extension Driver {
193193
commandLine.appendFlag(.resourceDir)
194194
commandLine.appendPath(VirtualPath.lookup(frontendTargetInfo.runtimeResourcePath.path))
195195

196-
try commandLine.appendAll(.I, from: &parsedOptions)
197-
for systemImport in parsedOptions.arguments(for: .Isystem) {
198-
commandLine.appendFlag("-isystem")
199-
commandLine.appendFlag(systemImport.argument.asSingle)
200-
}
201-
try commandLine.appendAll(.F, from: &parsedOptions)
202-
for systemFramework in parsedOptions.arguments(for: .Fsystem) {
203-
commandLine.appendFlag(.iframework)
204-
commandLine.appendFlag(systemFramework.argument.asSingle)
205-
}
196+
try commandLine.appendAll(.I, .Isystem, from: &parsedOptions)
197+
try commandLine.appendAll(.F, .Fsystem, from: &parsedOptions)
206198

207199
try commandLine.appendLast(.swiftVersion, from: &parsedOptions)
208200
}

Sources/SwiftOptions/Options.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,6 @@ extension Option {
600600
public static let help_: Option = Option("--help", .flag, alias: Option.help, attributes: [.frontend, .autolinkExtract, .moduleWrap, .synthesizeInterface], helpText: "Display available options")
601601
public static let h: Option = Option("-h", .flag, alias: Option.help)
602602
public static let IEQ: Option = Option("-I=", .joined, alias: Option.I, attributes: [.frontend, .argumentIsPath])
603-
public static let iframework: Option = Option("-iframework", .joinedOrSeparate, attributes: [.noDriver, .argumentIsPath], helpText: "add a directory to the clang importer system framework search path")
604603
public static let ignoreAlwaysInline: Option = Option("-ignore-always-inline", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Ignore @inline(__always) attributes.")
605604
public static let ignoreModuleSourceInfo: Option = Option("-ignore-module-source-info", .flag, attributes: [.frontend, .noDriver], helpText: "Avoid getting source location from .swiftsourceinfo files")
606605
public static let ignoreSpiGroups: Option = Option("-ignore-spi-group", .separate, attributes: [.noDriver], helpText: "SPI group name to not diagnose about")
@@ -1564,7 +1563,6 @@ extension Option {
15641563
Option.help_,
15651564
Option.h,
15661565
Option.IEQ,
1567-
Option.iframework,
15681566
Option.ignoreAlwaysInline,
15691567
Option.ignoreModuleSourceInfo,
15701568
Option.ignoreSpiGroups,

0 commit comments

Comments
 (0)