File tree Expand file tree Collapse file tree 3 files changed +15
-10
lines changed
Expand file tree Collapse file tree 3 files changed +15
-10
lines changed Original file line number Diff line number Diff line change 1515 nix-test :
1616 runs-on : ubuntu-latest
1717 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
1823 - name : Checkout
1924 uses : actions/checkout@v4
2025 - name : Pull musl
Original file line number Diff line number Diff line change 3535 inputs = {
3636 # Use a recent stable release, but fix the version to make it reproducible.
3737 # This version should be updated from time to time.
38- nixpkgs . url = "nixpkgs/nixos-23.11 " ;
38+ nixpkgs . url = "nixpkgs/nixos-24.05 " ;
3939 flake-utils . url = "github:numtide/flake-utils" ;
4040 } ;
4141 outputs = { self , nixpkgs , flake-utils } :
4949 buildInputs = [
5050 # These dependencies are required for building tinygo (go install).
5151 go
52- llvmPackages_17 . llvm
53- llvmPackages_17 . libclang
52+ llvmPackages_18 . llvm
53+ llvmPackages_18 . libclang
5454 # Additional dependencies needed at runtime, for building and/or
5555 # flashing.
56- llvmPackages_17 . lld
56+ llvmPackages_18 . lld
5757 avrdude
5858 binaryen
5959 # Additional dependencies needed for on-chip debugging.
6868 # Without setting these explicitly, Homebrew versions might be used
6969 # or the default `ar` and `nm` tools might be used (which don't
7070 # 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 "
7272 export LLVM_AR=llvm-ar
7373 export LLVM_NM=llvm-nm
7474
7777 export MD5SUM=md5sum
7878
7979 # 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 "
8181 '' ;
8282 } ;
8383 }
You can’t perform that action at this time.
0 commit comments