pkgs/development/compilers/tinygo/0001-GNUmakefile.patch

   1 diff --git a/GNUmakefile b/GNUmakefile
   2 --- a/GNUmakefile
   3 +++ b/GNUmakefile
   4 @@ -14,11 +14,6 @@ LLVM_VERSIONS = 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 @@ -848,9 +843,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 @@ -871,7 +865,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN
  28  ifneq ($(USE_SYSTEM_BINARYEN),1)
  29         @cp -p  build/wasm-opt$(EXE)         build/release/tinygo/bin
  30  endif
  31 -       @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include
  32         @cp -rp lib/CMSIS/CMSIS/Include      build/release/tinygo/lib/CMSIS/CMSIS
  33         @cp -rp lib/CMSIS/README.md          build/release/tinygo/lib/CMSIS
  34         @cp -rp lib/macos-minimal-sdk/*      build/release/tinygo/lib/macos-minimal-sdk
  35 @@ -927,8 +920,7 @@ endif
  36         @cp -rp lib/wasi-libc/libc-top-half/musl/include                build/release/tinygo/lib/wasi-libc/libc-top-half/musl
  37         @cp -rp lib/wasi-libc/sysroot                                   build/release/tinygo/lib/wasi-libc/sysroot
  38         @cp -rp lib/wasi-cli/wit                                        build/release/tinygo/lib/wasi-cli/wit
  39 -       @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins
  40 -       @cp -rp llvm-project/compiler-rt/LICENSE.TXT  build/release/tinygo/lib/compiler-rt-builtins
  41 +       @cp -rp lib/compiler-rt-builtins     build/release/tinygo/lib/compiler-rt-builtins
  42         @cp -rp src                          build/release/tinygo/src
  43         @cp -rp targets                      build/release/tinygo/targets
  44
  45 --
  46 2.37.2
  47