From 5449ca2dbfb3ddaa3ee6336b7b461757bf93fdba Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 12 Oct 2023 18:25:02 +0000
Subject: [PATCH] Update .gitlab-ci.yml file force the Makefile system to use
our cross-compile binutil package
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 681c6e61f2..e2ec249960 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,7 @@ build-i686-linux-gnu:
- export OBJDUMP=i686-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX=1
+ - make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX=1
build-aarch64-linux-gnu:
<<: *job_build
@@ -95,7 +95,7 @@ build-aarch64-linux-gnu:
- export OBJDUMP=aarch64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX64=1 NONX86=1
+ - make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX64=1 NONX86=1
build-x86_64-linux-gnu:
<<: *job_build
@@ -112,7 +112,7 @@ build-x86_64-linux-gnu:
- export OBJDUMP=x86_64-linux-gnu-objdump
- export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
- *ccache
- - make --directory=src CCACHE=1 LINUX64=1
+ - make --directory=src CCACHE=1 OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP LINUX64=1
build-i686-w64-mingw32:
<<: *job_build
--
GitLab