Merge branch 'trunk' into direct-return-known-types

This commit is contained in:
Folkert de Vries 2021-09-21 23:01:09 +02:00 committed by GitHub
commit 693869336d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions

View File

@ -74,6 +74,8 @@ There are also alternative installation options at http://releases.llvm.org/down
## Using Nix
:exclamation: **Our Nix setup is currently broken, you'll have to install manually for now** :exclamation:
### Install
Using [nix](https://nixos.org/download.html) is a quick way to get an environment bootstrapped with a single command.

View File

@ -24,6 +24,7 @@ const Allocator = mem.Allocator;
extern fn roc__mainForHost_1_exposed() RocStr;
extern fn malloc(size: usize) callconv(.C) ?*c_void;
extern fn realloc(c_ptr: [*]align(@alignOf(u128)) u8, size: usize) callconv(.C) ?*c_void;
extern fn free(c_ptr: [*]align(@alignOf(u128)) u8) callconv(.C) void;

View File

@ -51,7 +51,6 @@ size_t roc_str_len(struct RocStr str) {
}
}
extern struct RocStr roc__mainForHost_1_exposed();
int main() {