Skip to content

Commit f9ee00e

Browse files
authored
Merge pull request swiftlang#448 from swiftwasm/main
[pull] swiftwasm from main
2 parents 1a3a99c + 943fee9 commit f9ee00e

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

Docs/GettingStarted.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ swift-corelibs-foundation swift-corelibs-xctest
2525

2626
Build and test steps:
2727

28-
0. Run Xcode with the latest toolchain. Follow [the instructions here](https://swift.org/download/#apple-platforms) to start Xcode with the correct toolchain.
28+
0. Run Xcode with the latest toolchain. Follow [the instructions here](https://swift.org/download/#installation) to start Xcode with the correct toolchain.
2929
0. Open `Foundation.xcworkspace`.
3030
0. Build the _SwiftFoundation_ target. This builds CoreFoundation and Foundation.
3131
0. Run (Cmd-R) the _TestFoundation_ target. This builds CoreFoundation, Foundation, XCTest, and TestFoundation, then runs the tests.
@@ -47,7 +47,7 @@ You will need:
4747

4848
* A supported distribution of Linux. At this time, we support [Ubuntu 16.04 and Ubuntu 18.04](http://www.ubuntu.com).
4949

50-
To get started, follow the instructions on how to [build Swift](https://github.com/apple/swift#building-swift). Foundation is developed at the same time as the rest of Swift, so the most recent version of the `clang` and `swift` compilers are required in order to build it. The easiest way to make sure you have all of the correct dependencies is to build everything together.
50+
To get started, follow the instructions on how to [build Swift](https://github.com/apple/swift/blob/main/docs/HowToGuides/GettingStarted.md#building-the-project-for-the-first-time). Foundation is developed at the same time as the rest of Swift, so the most recent version of the `clang` and `swift` compilers are required in order to build it. The easiest way to make sure you have all of the correct dependencies is to build everything together.
5151

5252
The default build script does not include Foundation. To configure and build Foundation and TestFoundation including lldb for debugging and the correct ICU library, the following command can be used. All other tests are disabled to reduce build and test time. `--release` is used to avoid building LLVM and the compiler with debugging.
5353
```

Sources/Foundation/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,19 @@ if(NOT BUILD_SHARED_LIBS)
181181
get_filename_component(icu_i18n_dir "${icui18n_path}" DIRECTORY)
182182
string(REPLACE "lib" "" icu_i18n_basename "${icu_i18n_basename}")
183183

184+
get_target_property(icuuc_path ICU::uc IMPORTED_LOCATION)
185+
get_filename_component(icu_uc_basename "${icuuc_path}" NAME_WE)
186+
string(REPLACE "lib" "" icu_uc_basename "${icu_uc_basename}")
187+
188+
get_target_property(icudata_path ICU::data IMPORTED_LOCATION)
189+
get_filename_component(icu_data_basename "${icudata_path}" NAME_WE)
190+
string(REPLACE "lib" "" icu_data_basename "${icu_data_basename}")
191+
184192
target_compile_options(Foundation
185193
PRIVATE
186194
"SHELL:-Xfrontend -public-autolink-library -Xfrontend ${icu_i18n_basename}
195+
-Xfrontend -public-autolink-library -Xfrontend ${icu_uc_basename}
196+
-Xfrontend -public-autolink-library -Xfrontend ${icu_data_basename}
187197
-Xfrontend -public-autolink-library -Xfrontend BlocksRuntime")
188198
# ICU libraries are linked by absolute library path in this project,
189199
# but -public-autolink-library forces to resolve library path by

Sources/Foundation/TimeZone.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ extension TimeZone : CustomStringConvertible, CustomDebugStringConvertible, Cust
255255
}
256256
}
257257

258-
extension TimeZone {
258+
extension TimeZone : _ObjectiveCBridgeable {
259259
public static func _isBridgedToObjectiveC() -> Bool {
260260
return true
261261
}

0 commit comments

Comments
 (0)