From f31661d392c1332ceb0edcbc9fd35f4cb49bb50d Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Wed, 11 Jan 2023 16:35:57 +0100
Subject: Support using custom build-dir during bootstrap.

---
 Jenkinsfile | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'Jenkinsfile')

diff --git a/Jenkinsfile b/Jenkinsfile
index 9a99f2d..14f0547 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,13 +5,13 @@ pipeline {
 		stage('Clean') {
 			steps {
 				echo 'Cleaning workspace ...'
-				sh 'rm -Rf build build-gcc build-clang'
+				sh 'rm -Rf build*'
 			}
 		}
 		stage('Build-gcc') {
 			steps {
 				echo 'Building (gcc) ...'
-				sh './bootstrap.sh'
+				sh 'BUILDDIR=build-gcc CXX=g++ ./bootstrap.sh'
 			}
 		}
 		stage('Test-gcc') {
@@ -19,16 +19,11 @@ pipeline {
 				echo 'Testing (gcc) ...'
 				sh './ctor check'
 			}
-			post {
-				always {
-					sh 'mv build build-gcc'
-				}
-			}
 		}
 		stage('Build-clang') {
 			steps {
 				echo 'Building (clang) ...'
-				sh 'CXX=clang++ ./bootstrap.sh'
+				sh 'BUILDDIR=build-clang CXX=clang++ ./bootstrap.sh'
 			}
 		}
 		stage('Test-clang') {
@@ -36,11 +31,6 @@ pipeline {
 				echo 'Testing (clang) ...'
 				sh './ctor check'
 			}
-			post {
-				always {
-					sh 'mv build build-clang'
-				}
-			}
 		}
 	}
 
-- 
cgit v1.2.3