Skip to content

Conversation

kateinoigakukun
Copy link
Member

@kateinoigakukun kateinoigakukun commented Sep 8, 2024

This is a follow-up fix to f078f7a that I made at the last minute before merging...

This is a follow-up fix to f078f7a that I made at the last
minute before merging...
Including `sys/resource.h` from wasi-libc requires a feature macro to be
defined (`-D_WASI_EMULATED_PROCESS_CLOCKS`) and emits compilation errors
otherwise. However, the header is not used in WASI paths, so it is safe
to exclude it from the list of includes.

See `sys/times.h` that is transitively included by `sys/resource.h`
https://github.com/WebAssembly/wasi-libc/blob/wasi-sdk-22/libc-top-half/musl/include/sys/times.h
@grynspan
Copy link
Contributor

grynspan commented Sep 8, 2024

@swift-ci test

@grynspan grynspan added bug 🪲 Something isn't working wasi/wasm 🧭 WebAssembly support build 🧱 Affects the project's build configuration or process exit-tests ☠️ Work related to exit tests swift-6.1 labels Sep 8, 2024
@kateinoigakukun kateinoigakukun merged commit e7a7e23 into swiftlang:main Sep 8, 2024
3 checks passed
@kateinoigakukun kateinoigakukun deleted the yt/fix-last-min-change branch September 8, 2024 14:12
@grynspan grynspan added this to the Swift 6.1 milestone Sep 10, 2024
@grynspan
Copy link
Contributor

@kateinoigakukun Note if you need this fix in Swift 6.0.1, please clone the PR and nominate it using the procedure outlined here.

stmontgomery referenced this pull request Sep 17, 2024
- **Explanation**: Switch to the official [600.0.0
tag](https://github.com/swiftlang/swift-syntax/releases/tag/600.0.0) for
swift-syntax, which was recently created.
- **Original PR**: [#651
https://github.com/swiftlang/swift-testing/pull/672](https://github.com/swiftlang/swift-testing/pull/690)
- **Risk**: Low
- **Testing**: Tested in ci.swift.org
- **Reviewer**: @grynspan @briancroom
stmontgomery referenced this pull request Sep 20, 2024
- **Explanation**: Switch to the official [600.0.0
tag](https://github.com/swiftlang/swift-syntax/releases/tag/600.0.0) for
swift-syntax, which was recently created.
- **Original PR**: [#651
https://github.com/swiftlang/swift-testing/pull/672](https://github.com/swiftlang/swift-testing/pull/690)
- **Risk**: Low
- **Testing**: Tested in ci.swift.org
- **Reviewer**: @grynspan @briancroom
grynspan pushed a commit that referenced this pull request Sep 24, 2024
- **Explanation**: When building the Testing library as a static library
(BUILD_SHARED_LIBS=FALSE), `_TestingInternals` is not included in the
`libTesting.a` archive by default. (when building as a shared library,
`libTesting.so` includes `_TestingInternals` objects). This causes the
linker to complain about missing symbols, so we need to ship
`lib_TestingInternals.a` and autolink it too.
- **Original PR**: #651
#672
- **Risk**: Low; NFC for non WASI platforms
- **Testing**: Tested in ci.swift.org
- **Reviewer**: @grynspan @briancroom
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug 🪲 Something isn't working build 🧱 Affects the project's build configuration or process exit-tests ☠️ Work related to exit tests wasi/wasm 🧭 WebAssembly support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants