]> git.ipfire.org Git - people/arne_f/ipfire-2.x.git/commitdiff
zstd: update to 1.5.0 and fix toolchain gcc use.
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 1 Jul 2021 06:30:27 +0000 (08:30 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Jul 2021 05:42:39 +0000 (07:42 +0200)
1.5.0 also fix armv6 bus errors.

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

index 203a6951abdeaca9404a88c3825a171f1e869352..773d0df570e461019b52d2c53d3306e52dde685c 100644 (file)
--- 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)