Changed Mingw-w64 sysroot to mingw-w64-sysroot.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

3 files changed, 14 insertions, 12 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4571eb..18a362d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 cache:
   key: toolchain
   paths:
-    - w64-mingw32-sysroot/
+    - mingw-w64-sysroot/
     - EASTL-build/libEASTL.a
     - EASTL-native-build/libEASTL.a
     - CRT/*.o
@@ -23,11 +23,11 @@ before_script:
 
 makedeps:
   script:
-    - if [ "x${FORCE_TOOLCHAIN_REBUILD:-}" != "x" ]; then rm -rf w64-mingw32-sysroot/; fi
+    - if [ "x${FORCE_TOOLCHAIN_REBUILD:-}" != "x" ]; then rm -rf mingw-w64-sysroot/; fi
     - pwd
     - >
-        { test -x w64-mingw32-sysroot/x86_64/bin/x86_64-w64-mingw32-gcc && \
-          test -x w64-mingw32-sysroot/x86_64/bin/x86_64-w64-mingw32-g++ && \
+        { test -x mingw-w64-sysroot/x86_64/bin/x86_64-w64-mingw32-gcc && \
+          test -x mingw-w64-sysroot/x86_64/bin/x86_64-w64-mingw32-g++ && \
           test -r CRT/kcrt.opp && \
           test -r EASTL-build/libEASTL.a && \
           test -r EASTL-native-build/libEASTL.a; } || \
@@ -51,11 +51,11 @@ build:
   script:
     - make help
     - make help BUILD_NATIVE=1
-    - ls -alh w64-mingw32-sysroot/x86_64/
-    - ls -alh w64-mingw32-sysroot/x86_64/bin/
+    - ls -alh mingw-w64-sysroot/x86_64/
+    - ls -alh mingw-w64-sysroot/x86_64/bin/
     - pwd
     - mkdir -p ./mingw-w64-build && touch ./mingw-w64-build/mingw-w64-build
-    - touch -m ./w64-mingw32-sysroot/x86_64/bin/x86_64-w64-mingw32-gcc
+    - touch -m ./mingw-w64-sysroot/x86_64/bin/x86_64-w64-mingw32-gcc
     - make -j1 all WERROR=1 Q=
     - make -j1 install WERROR=1 Q= DESTDIR=_install
     - ls -alh _install
diff --git a/Makefile.deps b/Makefile.deps
index 34cb146..0dd33d8 100644
--- a/Makefile.deps
+++ b/Makefile.deps
@@ -1,5 +1,7 @@
 DPP_ROOT = .
-ACTIVATE_SH = ./w64-mingw32-sysroot/x86_64/activate.sh
+SYSROOT = mingw-w64-sysroot
+SYSROOT_X64 = $(SYSROOT)/x86_64
+ACTIVATE_SH = ./$(SYSROOT_X64)/activate.sh
 
 MAKE_PID := $(shell echo $$PPID)
 JOBS := $(shell ps T | sed -n 's/.*$(MAKE_PID).*$(MAKE).* \(-j\|--jobs=\) *\([0-9][0-9]*\).*/\2/p')
@@ -58,14 +60,14 @@ $(LOCAL_MINGW64_CC): $(LOCAL_MINGW64_BUILD_SCRIPT)
 ifeq ($(CC),$(LOCAL_MINGW64_CC))
 	@echo
 	@echo "------------------------------------------------------------------------------------------------"
-	@echo "-- ./w64-mingw32-sysroot/x86_64/bin/x86_64-w64-mingw32-gcc does not exist, building toolchain --"
+	@echo "-- ./$(SYSROOT_X64)/bin/x86_64-w64-mingw32-gcc does not exist, building toolchain --"
 	@echo "------------------------------------------------------------------------------------------------"
 	@echo
-	env -i ./mingw-w64-build/mingw-w64-build --root="$(shell realpath ./w64-mingw32-sysroot)" --disable-threads --jobs $(JOBS) x86_64
+	env -i ./mingw-w64-build/mingw-w64-build --root="$(shell realpath ./$(SYSROOT))" --disable-threads --jobs $(JOBS) x86_64
 	@echo '#!/usr/bin/env bash' >$(ACTIVATE_SH)
 	@echo >>$(ACTIVATE_SH)
 	@echo 'MYDIR="$$(realpath $$(dirname $${BASH_SOURCE[0]}))"' >>$(ACTIVATE_SH)
-	@echo 'export PATH="$${MYDIR}/w64-mingw32-sysroot/x86_64/bin:$${MYDIR}/bin:$${PATH}"' >>$(ACTIVATE_SH)
+	@echo 'export PATH="$${MYDIR}/$(SYSROOT_X64)/bin:$${MYDIR}/bin:$${PATH}"' >>$(ACTIVATE_SH)
 	@chmod +x $(ACTIVATE_SH)
 endif
 
diff --git a/Makefile.inc b/Makefile.inc
index ac4fb8a..95b7606 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -14,7 +14,7 @@ CMAKE_Q = VERBOSE=1
 endif
 DPP_ROOT = $(realpath .)
 LOCAL_MINGW64_BUILD_SCRIPT := $(DPP_ROOT)/mingw-w64-build/mingw-w64-build
-LOCAL_MINGW64_BUILD_DIR := $(DPP_ROOT)/w64-mingw32-sysroot/x86_64
+LOCAL_MINGW64_BUILD_DIR := $(DPP_ROOT)/mingw-w64-sysroot/x86_64
 LOCAL_MINGW64_CC := $(LOCAL_MINGW64_BUILD_DIR)/bin/x86_64-w64-mingw32-gcc
 LOCAL_MINGW64_CXX := $(LOCAL_MINGW64_BUILD_DIR)/bin/x86_64-w64-mingw32-g++
 LOCAL_MINGW64_RC := $(LOCAL_MINGW64_BUILD_DIR)/bin/x86_64-w64-mingw32-windres