Skip to content

Support -static-stdlib on non-Apple platforms #24

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
merged 7 commits into from
Jul 8, 2022
Merged

Support -static-stdlib on non-Apple platforms #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f5735b3
Support `--static-stdlib` on non-Apple platforms
stephencelis Jul 8, 2022
ac57460
CI
stephencelis Jul 8, 2022
8b85e0c
wip
stephencelis Jul 8, 2022
8700012
wip
stephencelis Jul 8, 2022
5cb2d7e
wip
stephencelis Jul 8, 2022
9ef345d
wip
stephencelis Jul 8, 2022
296b318
give up
stephencelis Jul 8, 2022
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
14 changes: 13 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,19 @@ test-linux:
-v "$(PWD):$(PWD)" \
-w "$(PWD)" \
swift:5.6.2-focal \
bash -c "make test"
bash -c "apt-get update && apt-get install make && make test"

test-linux-static-stdlib:
@docker run \
-v "$(PWD):$(PWD)" \
-w "$(PWD)" \
swift:5.6.2-focal \
bash -c "swift build -c debug -Xswiftc -static-stdlib"
@docker run \
-v "$(PWD):$(PWD)" \
-w "$(PWD)" \
swift:5.6.2-focal \
bash -c "swift build -c release -Xswiftc -static-stdlib"

format:
@swift format \
Expand Down
16 changes: 16 additions & 0 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Sources/XCTestDynamicOverlay/XCTFail.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,12 @@
dlsym(dlopen(nil, RTLD_LAZY), "_XCTFailureHandler"),
to: XCTFailureHandler.self
)
#else
#elseif canImport(XCTest)
// NB: It seems to be safe to import XCTest on Linux
@_exported import func XCTest.XCTFail
#else
public func XCTFail(_ message: String = "") {}
public func XCTFail(_ message: String = "", file: StaticString, line: UInt) {}
#endif
#else
/// This function generates a failure immediately and unconditionally.
Expand Down