Skip to content

build: Remove unused platform files now that devbox is used #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 9, 2023
Merged

build: Remove unused platform files now that devbox is used #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad5fdc5
build: Remove unused platform files now that devbox is used
jimmidyson Aug 9, 2023
8d07411
build: Remove unnecessary bash version check
jimmidyson Aug 9, 2023
64ef238
build: Remove upx for darwin binaries completely
jimmidyson Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion make/all.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ include $(INCLUDE_DIR)make.mk
include $(INCLUDE_DIR)shell.mk
include $(INCLUDE_DIR)help.mk
include $(INCLUDE_DIR)repo.mk
include $(INCLUDE_DIR)platform.mk
include $(INCLUDE_DIR)tools.mk
include $(INCLUDE_DIR)pre-commit.mk
include $(INCLUDE_DIR)go.mk
Expand Down
22 changes: 0 additions & 22 deletions make/platform.mk
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions make/shell.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,3 @@
# This is compatible with Darwin, see https://itnext.io/upgrading-bash-on-macos-7138bd1066ba
SHELL := /usr/bin/env bash
.SHELLFLAGS = -euo pipefail -c

# We need to explicitly get the bash version via shell command here because the user could be
# running a different shell and hence BASH_VERSION var will not be set in the Make environment.
BASH_VERSION := $(shell echo $${BASH_VERSION})
ifneq (5, $(word 1, $(sort 5 $(BASH_VERSION))))
$(error Only bash >= 5 is supported (current version: $(BASH_VERSION)). Please upgrade your version of bash. If on macOS, see https://formulae.brew.sh/formula/bash)
endif
5 changes: 2 additions & 3 deletions make/upx.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ upx: UPX_REAL_TARGET := $(addsuffix $(if $(filter $(GOOS),windows),.exe),$(basen
ifneq ($(SKIP_UPX),true)
ifeq ($(GOOS)/$(GOARCH),windows/arm64)
upx: ; $(info $(M) skipping packing $(UPX_REAL_TARGET) - $(GOOS)/$(GOARCH) is not yet supported by upx)
# TODO Remove once upx 4.0.2 is released
else ifeq ($(GOOS)/$(GOARCH),darwin/arm64)
upx: ; $(info $(M) skipping packing $(UPX_REAL_TARGET) - $(GOOS)/$(GOARCH) has a bug in packing - https://github.com/upx/upx/issues/628 - should be fixed in 4.0.2)
else ifeq ($(GOOS),darwin)
upx: ; $(info $(M) skipping packing $(UPX_REAL_TARGET) - $(GOOS)/$(GOARCH) has a bug in packing on Ventura - https://github.com/upx/upx/issues/628)
else
upx: ## Pack executable using upx
upx: ; $(info $(M) packing $(UPX_REAL_TARGET))
Expand Down