File tree 3 files changed +15
-10
lines changed
3 files changed +15
-10
lines changed Original file line number Diff line number Diff line change 15
15
nix-test :
16
16
runs-on : ubuntu-latest
17
17
steps :
18
+ - name : Uninstall system LLVM
19
+ # Hack to work around issue where we still include system headers for
20
+ # some reason.
21
+ # See: https://github.com/tinygo-org/tinygo/pull/4516#issuecomment-2416363668
22
+ run : sudo apt-get remove llvm-18
18
23
- name : Checkout
19
24
uses : actions/checkout@v4
20
25
- name : Pull musl
Original file line number Diff line number Diff line change 35
35
inputs = {
36
36
# Use a recent stable release, but fix the version to make it reproducible.
37
37
# This version should be updated from time to time.
38
- nixpkgs . url = "nixpkgs/nixos-23.11 " ;
38
+ nixpkgs . url = "nixpkgs/nixos-24.05 " ;
39
39
flake-utils . url = "github:numtide/flake-utils" ;
40
40
} ;
41
41
outputs = { self , nixpkgs , flake-utils } :
49
49
buildInputs = [
50
50
# These dependencies are required for building tinygo (go install).
51
51
go
52
- llvmPackages_17 . llvm
53
- llvmPackages_17 . libclang
52
+ llvmPackages_18 . llvm
53
+ llvmPackages_18 . libclang
54
54
# Additional dependencies needed at runtime, for building and/or
55
55
# flashing.
56
- llvmPackages_17 . lld
56
+ llvmPackages_18 . lld
57
57
avrdude
58
58
binaryen
59
59
# Additional dependencies needed for on-chip debugging.
68
68
# Without setting these explicitly, Homebrew versions might be used
69
69
# or the default `ar` and `nm` tools might be used (which don't
70
70
# support wasi).
71
- export CLANG="clang-17 -resource-dir ${ llvmPackages_17 . clang . cc . lib } /lib/clang/17 "
71
+ export CLANG="clang-18 -resource-dir ${ llvmPackages_18 . clang . cc . lib } /lib/clang/18 "
72
72
export LLVM_AR=llvm-ar
73
73
export LLVM_NM=llvm-nm
74
74
77
77
export MD5SUM=md5sum
78
78
79
79
# Ugly hack to make the Clang resources directory available.
80
- export GOFLAGS="\"-ldflags=-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${ llvmPackages_17 . clang . cc . lib } /lib/clang/17 \" -tags=llvm17 "
80
+ export GOFLAGS="\"-ldflags=-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${ llvmPackages_18 . clang . cc . lib } /lib/clang/18 \" -tags=llvm18 "
81
81
'' ;
82
82
} ;
83
83
}
You can’t perform that action at this time.
0 commit comments