tjh.dev
1diff --git a/GNUmakefile b/GNUmakefile
2--- a/GNUmakefile
3+++ b/GNUmakefile
4@@ -14,11 +14,6 @@ LLVM_VERSIONS = 14 13 12 11
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@@ -707,9 +702,8 @@ 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/clang/include
24 @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS
25 @mkdir -p build/release/tinygo/lib/macos-minimal-sdk
26 @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
27@@ -721,15 +715,8 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN
28 @mkdir -p build/release/tinygo/lib/picolibc/newlib/libc
29 @mkdir -p build/release/tinygo/lib/picolibc/newlib/libm
30 @mkdir -p build/release/tinygo/lib/wasi-libc
31- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0
32- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus
33- @mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4
34 @echo copying source files
35 @cp -p build/tinygo$(EXE) build/release/tinygo/bin
36-ifneq ($(USE_SYSTEM_BINARYEN),1)
37- @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin
38-endif
39- @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
40 @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS
41 @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS
42 @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk
43@@ -768,16 +755,9 @@ endif
44 @cp -rp lib/picolibc/newlib/libm/common build/release/tinygo/lib/picolibc/newlib/libm
45 @cp -rp lib/picolibc-stdio.c build/release/tinygo/lib
46 @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot
47- @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins
48- @cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt-builtins
49+ @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins
50 @cp -rp src build/release/tinygo/src
51 @cp -rp targets build/release/tinygo/targets
52- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt
53- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/compiler-rt compiler-rt
54- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/compiler-rt compiler-rt
55- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/picolibc picolibc
56- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/picolibc picolibc
57- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/picolibc picolibc
58
59 release:
60 tar -czf build/release.tar.gz -C build/release tinygo
61--
622.37.2
63