From 790559e3c45729d36948cf76d32bf1dd1cba32af Mon Sep 17 00:00:00 2001
From: Joerg Koenig <Joerg.Koenig@techsat.com>
Date: Sat, 1 Jun 2019 10:14:16 +0200
Subject: Fixed PATH in MinGW environment

Change-Id: I2fbfad4b1a6a8b3040877b97f224a084c98c24c6
---
 Jenkinsfile      | 31 +++++++++++++++++--------------
 Makefile.mingw64 |  6 ------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 81bc8a4..a270e31 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,6 +47,23 @@ stage('Build') {
         		    submoduleCfg: [], 
         		    userRemoteConfigs: [[url: REPO]]])
 
+		    stage ("Windows 64 Bit MinGW Build") {
+			sh '''
+			    echo "Cleanup prev. builds ..."
+			    WS=$(cygpath $WORKSPACE)
+			    rm -f openssl-1.0.2r/NUL
+			    rm -Rf openssl-1.0.2r
+			    echo "Done."
+			    cp -Rvf /c/dev-tools/gcc-suite/1.3.0/x86-mingw64/gcc-8.2.0 $WS/
+			    export PATH=$WS/gcc-8.2.0/bin:/c/dev-tools/msys/x86/usr/bin:$PATH
+			    export CC=$WS/gcc-8.2.0/bin/gcc 
+			    export CXX=$WS/gcc-8.2.0/bin/g++ 
+			    gcc -v
+			    make -f Makefile.mingw64 all
+			    rm -Rf build.$(ARCH)
+			    rm -Rf install.$(ARCH)
+			'''
+		    }
 		    stage ("Windows 64 Bit MSVC Build") {
 			sh '''
 			    rm -f openssl-1.0.2r/NUL
@@ -61,20 +78,6 @@ stage('Build') {
 			    buildqt64.bat
 			'''
 		    }
-		    stage ("Windows 64 Bit MinGW Build") {
-			sh '''
-			    echo "Cleanup prev. builds ..."
-			    export PATH=/c/dev-tools/msys/x86/usr/bin:$PATH
-			    WS=$(cygpath $WORKSPACE)
-			    rm -f openssl-1.0.2r/NUL
-			    rm -Rf openssl-1.0.2r
-			    cp -Rvf /c/dev-tools/gcc-suite/1.3.0/x86-mingw64/gcc-8.2.0 $WS/
-			    echo "Done."
-			    make GCC_PATH=$WS/gcc-8.2.0 -f Makefile.mingw64 all
-			    rm -Rf build.$(ARCH)
-			    rm -Rf install.$(ARCH)
-			'''
-		    }
 		    stash name: "qtwin", includes: "*-msvc.zip, *-x86-mingw64.tgz"
             } catch (e) {
                 echo 'Windows build failed'
diff --git a/Makefile.mingw64 b/Makefile.mingw64
index 1b710b2..0ba638e 100644
--- a/Makefile.mingw64
+++ b/Makefile.mingw64
@@ -14,10 +14,6 @@ SSL_ARCHIVE		= openssl-$(SSL_VERSION).tar.gz
 
 PACKAGE_NAME 		= qt-$(VERSION)-$(ARCH)
 
-ifeq ($(GCC_PATH),)
-    $(error GCC_PATH variable not set)
-endif
-
 all: download ssl qt
  
 ssl: ssl.$(ARCH)
@@ -32,7 +28,6 @@ ssl.$(ARCH):
 	cd $(LOCAL_BUILD_PATH) && \
 		tar --force-local -xzf  $(TOP)/SOURCE/$(SSL_ARCHIVE)
 	cd $(LOCAL_BUILD_PATH)/openssl-$(SSL_VERSION) && \
-	    export PATH=$(GCC_PATH)/bin:/c/dev-tools/msys/x86/usr/bin:/bin:/usr/bin && \
 	    export CFLAGS="-m64 -fpic" && \
 	    ./Configure --prefix=$(LOCAL_INST_PATH)/qt-$(VERSION)/$(ARCH) shared mingw64 && \
 	    make clean && \
@@ -51,7 +46,6 @@ qt.$(ARCH):
 	fi
 	cd $(LOCAL_BUILD_PATH)/qt-everywhere-src-$(VERSION) && \
 		rm -f config.cache && \
-		export PATH=$(GCC_PATH)/bin:/c/dev-tools/msys/x86/usr/bin:/bin:/usr/bin && \
 		./configure \
 			-platform win32-g++ \
 			-prefix $(LOCAL_INST_PATH)/qt-$(VERSION)/$(ARCH) \
-- 
cgit v0.12