Skip to content

Fixed xclibtool not accounting the artifacts retrieved from cache in certain scenarios. #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
polac24 merged 2 commits into from
Aug 2, 2023
+3 −1
Merged

Fixed xclibtool not accounting the artifacts retrieved from cache in certain scenarios. #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5741297
Fixed libtool executable accounted as its own argument.
grigorye Aug 2, 2023
fd6e1da
Fixed -static flag treated as an libtool input (library).
grigorye Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/xclibtool/XCLibtoolMain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class XCLibtoolMain {
let args = ProcessInfo().arguments

do {
let mode = try XCLibtoolHelper.buildMode(args: args)
let mode = try XCLibtoolHelper.buildMode(args: Array(args.dropFirst()))
try XCLibtool(mode).run()
} catch {
exit(1, "Failed with: \(error). Args: \(args)")
Expand Down
2 changes: 2 additions & 0 deletions Sources/xclibtoolSupport/XCLibtoolHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ public class XCLibtoolHelper {
case "-dependency_info":
dependencyInfo = args[i + 1]
i += 1
case "-static":
() // just ignore it for now
case let input where ["", "a"].contains(URL(string: args[i])?.pathExtension):
// Support for static frameworks (no extension) and static libraries (.a)
inputLibraries.append(input)
Expand Down