Skip to content

Commit

Permalink
Merge pull request #26 from /issues/24
Browse files Browse the repository at this point in the history
  • Loading branch information
kkebo authored Jun 10, 2024
2 parents d2c4373 + 48afe60 commit e37b185
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ on:
jobs:
build-linux:
runs-on: ubuntu-latest
container: swiftlang/swift:nightly-6.0-jammy
container: swiftlang/swift:nightly-main-jammy
steps:
- uses: actions/checkout@v4
- run: apt-get update && apt-get install --no-install-recommends -y make llvm-14
- run: make OBJCOPY=llvm-objcopy-14
lint:
runs-on: ubuntu-latest
container: swiftlang/swift:nightly-6.0-jammy
container: swiftlang/swift:nightly-main-jammy
steps:
- uses: actions/checkout@v4
- run: swift format lint -rs .
11 changes: 2 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ An operating system written in Swift.
- Fedora: `sudo dnf install qemu-system-aarch64-core`
- Ubuntu: `sudo apt install qemu-system-arm`
- macOS: `brew install qemu`
- Swift 6.0 (because Embedded Swift is used)
- Swift trunk development (main) toolchain (because Embedded Swift is used)
- On Linux, you can easily install the toolchain using [swiftly](https://swift-server.github.io/swiftly/).

```shell
curl -L https://swift-server.github.io/swiftly/swiftly-install.sh | bash
swiftly install 6.0-snapshot
swiftly install main-snapshot
```

## Building
Expand All @@ -33,13 +33,6 @@ An operating system written in Swift.
make
```

> [!WARNING]
> If you used swiftly to install Swift, you have to modify `Makefile` until https://github.com/swift-server/swiftly/issues/92 is resolved.
>
> ```makefile
> SWIFT := swift-legacy-driver
> ```

## Cleaning build outputs

```shell
Expand Down
2 changes: 1 addition & 1 deletion Sources/Kernel/kernel.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@_silgen_name("kmain")
@_cdecl("kmain")
public func kmain() {
initUART()

Expand Down
2 changes: 1 addition & 1 deletion Sources/Kernel/putchar.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@_silgen_name("putchar")
@_cdecl("putchar")
@discardableResult
@inlinable
public func putchar(_ c: CInt) -> CInt {
Expand Down

0 comments on commit e37b185

Please sign in to comment.