From 6764da436ae039645df2af1c1d53f7cd45a9638b Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 6 Mar 2019 06:46:57 -0500 Subject: gitlab-ci: Explicitly set bindist tarball name --- mk/config.mk.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mk') diff --git a/mk/config.mk.in b/mk/config.mk.in index 22a3d3904e..0fc6d4dd16 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -384,12 +384,12 @@ GhcRtsWithLibdw=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64),@UseLibdw@, # ################################################################################ -BINDIST = NO -BIN_DIST_NAME = ghc-$(ProjectVersion) -BIN_DIST_PREP_DIR = bindistprep/$(BIN_DIST_NAME) -BIN_DIST_PREP_TAR = bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar -BIN_DIST_PREP_TAR_COMP = $(BIN_DIST_PREP_TAR).$(TAR_COMP_EXT) -BIN_DIST_TAR_COMP = $(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.$(TAR_COMP_EXT) +BINDIST = NO +BIN_DIST_NAME = ghc-$(ProjectVersion) +BIN_DIST_PREP_DIR = bindistprep/$(BIN_DIST_NAME) +BIN_DIST_PREP_TAR = bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar +BIN_DIST_PREP_TAR_COMP ?= $(BIN_DIST_PREP_TAR).$(TAR_COMP_EXT) +BIN_DIST_TAR_COMP = $(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.$(TAR_COMP_EXT) # ----------------------------------------------------------------------------- # Utilities programs: flags -- cgit v1.2.1