diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 32b16206b2..a7d7c2fac8 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -35,6 +35,9 @@ jobs: path: | llvm-project/compiler-rt - uses: cachix/install-nix-action@v22 + - name: Build + run: | + nix develop --ignore-environment --keep HOME --command bash -c "go install && set && ldd ~/go/bin/tinygo && ~/go/bin/tinygo version" - name: Test run: | - nix develop --ignore-environment --keep HOME --command bash -c "go install && ~/go/bin/tinygo version && ~/go/bin/tinygo build -o test ./testdata/cgo" + nix develop --ignore-environment --keep HOME --command bash -c "~/go/bin/tinygo build -o test ./testdata/cgo" diff --git a/flake.nix b/flake.nix index 25ffc70205..63cb551a1f 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,7 @@ export MD5SUM=md5sum # Ugly hack to make the Clang resources directory available. - export GOFLAGS="\"-ldflags=-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${llvmPackages_18.clang.cc.lib}/lib/clang/18\" -tags=llvm18" + #export GOFLAGS="\"-ldflags=-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${llvmPackages_18.clang.cc.lib}/lib/clang/18\" -tags=llvm18" ''; }; }