tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From fcae473c4b6ac2120ec75c321d6db850d8ecd6a9 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
3Date: Sat, 30 Apr 2022 16:37:44 +0300
4Subject: [PATCH 1/3] Makefile
5
6
7diff --git a/Makefile b/Makefile
8index dc388c21..7efc9901 100644
9--- a/Makefile
10+++ b/Makefile
11@@ -14,11 +14,6 @@ LLVM_VERSIONS = 14 13 12 11
12 errifempty = $(if $(1),$(1),$(error $(2)))
13 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)))
14 toolSearchPathsVersion = $(1)-$(2)
15-ifeq ($(shell uname -s),Darwin)
16- # Also explicitly search Brew's copy, which is not in PATH by default.
17- BREW_PREFIX := $(shell brew --prefix)
18- toolSearchPathsVersion += $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)-$(2) $(BREW_PREFIX)/opt/llvm@$(2)/bin/$(1)
19-endif
20 # 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.
21 findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1))
22 CLANG ?= $(call findLLVMTool,clang)
23@@ -644,9 +639,8 @@ endif
24 wasmtest:
25 $(GO) test ./tests/wasm
26
27-build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen)
28+build/release:
29 @mkdir -p build/release/tinygo/bin
30- @mkdir -p build/release/tinygo/lib/clang/include
31 @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS
32 @mkdir -p build/release/tinygo/lib/macos-minimal-sdk
33 @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
34@@ -663,10 +657,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN
35 @mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4
36 @echo copying source files
37 @cp -p build/tinygo$(EXE) build/release/tinygo/bin
38-ifneq ($(USE_SYSTEM_BINARYEN),1)
39- @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin
40-endif
41- @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
42 @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS
43 @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS
44 @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk
45@@ -705,8 +695,7 @@ endif
46 @cp -rp lib/picolibc/newlib/libm/common build/release/tinygo/lib/picolibc/newlib/libm
47 @cp -rp lib/picolibc-stdio.c build/release/tinygo/lib
48 @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot
49- @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins
50- @cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt-builtins
51+ @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins
52 @cp -rp src build/release/tinygo/src
53 @cp -rp targets build/release/tinygo/targets
54 ./build/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt
55--
562.36.0
57