summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoenig, Joerg <Joerg.Koenig@techsat.com>2023-08-25 15:51:17 (GMT)
committerKoenig, Joerg <Joerg.Koenig@techsat.com>2023-08-25 15:51:17 (GMT)
commit5f216df859f753f4b0c2c618e8d1c2f6516a2610 (patch)
treefa56e00cfafa5c8ea6e3f2c5738dd2e72daae8cf
parentdd7d90d5c2307fc9dda509b3a95fa8110d232e3b (diff)
downloadcrossarm-5f216df859f753f4b0c2c618e8d1c2f6516a2610.zip
crossarm-5f216df859f753f4b0c2c618e8d1c2f6516a2610.tar.gz
crossarm-5f216df859f753f4b0c2c618e8d1c2f6516a2610.tar.bz2
Respect jenkins BUILD_NUMBER in SUITE version)
Change-Id: Ibd996c1f78c3681d49b4b806204623899c05df8b
-rw-r--r--Makefile8
-rw-r--r--mkincs/versions.mk9
2 files changed, 9 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index da0b6e3..053280c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,14 @@ MKINCS = $(TOP)/mkincs
include $(MKINCS)/versions.mk
+ifeq ($(BUILD_NUMBER),)
+SUITE = $(BASE_VERSION)
+else
+SUITE = $(BASE_VERSION)-$(BUILD_NUMBER)
+endif
+
+PKGVERSION = "TechSAT aarch64 X-Toolchain v$(SUITE)"
+
TARGET_TRIPLET = aarch64-linux-gnu
NUMJOBS = $(shell getconf _NPROCESSORS_ONLN 2> /dev/null)
diff --git a/mkincs/versions.mk b/mkincs/versions.mk
index ab0bd0e..27e4d91 100644
--- a/mkincs/versions.mk
+++ b/mkincs/versions.mk
@@ -1,12 +1,5 @@
# Binutils
-BASE = 1.0.0
-ifeq ($(BUILD_NUMBER),)
-SUITE = $(BASE)
-else
-SUITE = $(BASE).$(BUILD_NUMBER)
-endif
-
-PKGVERSION = "TechSAT aarch64 X-Toolchain v$(SUITE)"
+BASE_VERSION = 1.0.0
VERSION_BINUTILS = 2.38
VERSION_GCC = 10.2.0