tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/GNUmakefile b/GNUmakefile
2index f078bde5..901c8e08 100644
3--- a/GNUmakefile
4+++ b/GNUmakefile
5@@ -21,11 +21,6 @@ LLVM_VERSIONS = 19 18 17 16 15
6 errifempty = $(if $(1),$(1),$(error $(2)))
7 detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2)))
8 toolSearchPathsVersion = $(1)-$(2)
9-ifeq ($(uname),Darwin)
10- # Also explicitly search Brew's copy, which is not in PATH by default.
11- BREW_PREFIX := $(shell brew --prefix)
12- toolSearchPathsVersion += $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)-$(2) $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)
13-endif
14 # First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name.
15 findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1))
16 CLANG ?= $(call findLLVMTool,clang)
17@@ -942,10 +937,9 @@ endif
18 wasmtest:
19 $(GO) test ./tests/wasm
20
21-build/release: tinygo gen-device $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen)
22+build/release:
23 @mkdir -p build/release/tinygo/bin
24 @mkdir -p build/release/tinygo/lib/bdwgc
25- @mkdir -p build/release/tinygo/lib/clang/include
26 @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS
27 @mkdir -p build/release/tinygo/lib/macos-minimal-sdk
28 @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/crt
29@@ -968,7 +962,6 @@ ifneq ($(USE_SYSTEM_BINARYEN),1)
30 @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin
31 endif
32 @cp -rp lib/bdwgc/* build/release/tinygo/lib/bdwgc
33- @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
34 @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS
35 @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS
36 @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk
37@@ -1060,8 +1053,7 @@ endif
38 @cp -rp lib/wasi-libc/libc-top-half/musl/src/unistd build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
39 @cp -rp lib/wasi-libc/libc-top-half/sources build/release/tinygo/lib/wasi-libc/libc-top-half
40 @cp -rp lib/wasi-cli/wit build/release/tinygo/lib/wasi-cli/wit
41- @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins
42- @cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt-builtins
43+ @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins
44 @cp -rp src build/release/tinygo/src
45 @cp -rp targets build/release/tinygo/targets
46