From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 1 Jul 2021 06:30:27 +0000 (+0200)
Subject: zstd: update to 1.5.0 and fix toolchain gcc use.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4ce8ee51c06d13919f9c22dff279c22c60a9c1c;p=people%2Fstevee%2Fipfire-2.x.git

zstd: update to 1.5.0 and fix toolchain gcc use.

1.5.0 also fix armv6 bus errors.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/zstd b/lfs/zstd
index 203a6951ab..773d0df570 100644
--- a/lfs/zstd
+++ b/lfs/zstd
@@ -34,9 +34,11 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(TOOLCHAIN)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   PREFIX = $(TOOLS_DIR)
+  CC = $(CROSSTARGET)-gcc
 else
   TARGET = $(DIR_INFO)/$(THISAPP)
   PREFIX = /usr
+  CC = gcc
 endif
 
 ###############################################################################
@@ -80,7 +82,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make CC=$(CC) $(MAKETUNING)
 	cd $(DIR_APP) && make prefix=$(PREFIX) install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)