tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/GNUmakefile b/GNUmakefile
2--- a/GNUmakefile
3+++ b/GNUmakefile
4@@ -14,11 +14,6 @@ LLVM_VERSIONS = 19 18 17 16 15
5 errifempty = $(if $(1),$(1),$(error $(2)))
6 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)))
7 toolSearchPathsVersion = $(1)-$(2)
8-ifeq ($(shell uname -s),Darwin)
9- # Also explicitly search Brew's copy, which is not in PATH by default.
10- BREW_PREFIX := $(shell brew --prefix)
11- toolSearchPathsVersion += $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)-$(2) $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)
12-endif
13 # 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.
14 findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1))
15 CLANG ?= $(call findLLVMTool,clang)
16@@ -939,10 +934,9 @@ endif
17 wasmtest:
18 $(GO) test ./tests/wasm
19
20-build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen)
21+build/release:
22 @mkdir -p build/release/tinygo/bin
23 @mkdir -p build/release/tinygo/lib/bdwgc
24- @mkdir -p build/release/tinygo/lib/clang/include
25 @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS
26 @mkdir -p build/release/tinygo/lib/macos-minimal-sdk
27 @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
28@@ -964,7 +958,6 @@ ifneq ($(USE_SYSTEM_BINARYEN),1)
29 @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin
30 endif
31 @cp -rp lib/bdwgc/* build/release/tinygo/lib/bdwgc
32- @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
33 @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS
34 @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS
35 @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk
36@@ -1026,8 +1019,7 @@ endif
37 @cp -rp lib/wasi-libc/libc-top-half/musl/include build/release/tinygo/lib/wasi-libc/libc-top-half/musl
38 @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot
39 @cp -rp lib/wasi-cli/wit build/release/tinygo/lib/wasi-cli/wit
40- @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins
41- @cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt-builtins
42+ @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins
43 @cp -rp src build/release/tinygo/src
44 @cp -rp targets build/release/tinygo/targets
45
46--
472.48.1
48