Closed MaBecker closed 1 year ago
Need a new var for TAR running on MAC OS X.
brew install gnu-tar
git diff Makefile diff --git a/Makefile b/Makefile index 4052d28bc..232363f36 100755 --- a/Makefile +++ b/Makefile @@ -98,9 +98,11 @@ MACOSX=1 CFLAGS+=-D__MACOSX__ STAT_FLAGS='-f ''%z''' REALPATH='grealpath' +TAR='gtar' else STAT_FLAGS='-c ''%s''' REALPATH='realpath' +TAR='tar' endif ifeq ($(OS),Windows_NT)
git diff make/targets/ESP8266.make diff --git a/make/targets/ESP8266.make b/make/targets/ESP8266.make index 714970cf9..c1eefd738 100644 --- a/make/targets/ESP8266.make +++ b/make/targets/ESP8266.make @@ -109,7 +109,7 @@ $(ESP_ZIP): $(USER1_BIN) $(USER2_BIN) targets/esp8266/README_flash.txt \ targets/esp8266/Makefile \ $(PROJ_NAME) - $(Q)tar -zcf $(ESP_ZIP) $(PROJ_NAME) --transform='s/$(BINDIR)\///g' + $(Q)$(TAR) -zcf $(ESP_ZIP) $(PROJ_NAME) --transform='s/$(BINDIR)\///g' # Combined 512k/4096k binary that includes everything that's needed and can be # flashed to 0 in 512k/4096k parts
git diff make/targets/ESP32.make diff --git a/make/targets/ESP32.make b/make/targets/ESP32.make index 3716e0bf7..301823e31 100644 --- a/make/targets/ESP32.make +++ b/make/targets/ESP32.make @@ -23,7 +23,7 @@ $(ESP_ZIP): $(PROJ_NAME).bin $(ESP_APP_TEMPLATE_PATH)/build/partitions_espruino.bin \ targets/esp32/README_flash.txt \ $(PROJ_NAME) - $(Q)tar -zcf $(ESP_ZIP) $(PROJ_NAME) --transform='s/$(BINDIR)\///g' + $(Q)$(TAR) -zcf $(ESP_ZIP) $(PROJ_NAME) --transform='s/$(BINDIR)\///g' proj: $(PROJ_NAME).bin $(ESP_ZIP)
Thanks! Just done - next time if you could do a PR I can just click merge though and it might avoid me making any accidental mistakes
Need a new var for TAR running on MAC OS X.
brew install gnu-tar