Update Mingw to v8.0.0 and CMake to v3.19.2.
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
02d9adee17
commit
b009409486
|
@ -27,7 +27,7 @@ BINUTILSVCS="git://sourceware.org/git/binutils-gdb.git"
|
|||
|
||||
# CMake Settings
|
||||
CMAKEDIR="${SRCDIR}/cmake"
|
||||
CMAKETAG="v3.18.1"
|
||||
CMAKETAG="v3.19.2"
|
||||
CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
|
||||
|
||||
# GCC Settings
|
||||
|
@ -43,7 +43,7 @@ MAKEVCS="git://git.savannah.gnu.org/make"
|
|||
# Mingw-w64 Settings
|
||||
MINGWDIR="${SRCDIR}/mingw-w64"
|
||||
MINGWLIB="ucrt"
|
||||
MINGWTAG="v7.0.0"
|
||||
MINGWTAG="v8.0.0"
|
||||
MINGWNTV="0x601"
|
||||
MINGWVCS="https://github.com/mirror/mingw-w64.git"
|
||||
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
|
||||
index 818109f0b7..749377d193 100644
|
||||
--- a/Source/CMakeVersion.cmake
|
||||
+++ b/Source/CMakeVersion.cmake
|
||||
@@ -7,7 +7,7 @@ set(CMake_VERSION_IS_DIRTY 0)
|
||||
|
||||
# Start with the full version number used in tags. It has no dev info.
|
||||
set(CMake_VERSION
|
||||
- "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
|
||||
+ "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}-XTC")
|
||||
if(DEFINED CMake_VERSION_RC)
|
||||
set(CMake_VERSION "${CMake_VERSION}-rc${CMake_VERSION_RC}")
|
||||
endif()
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/job.c b/src/job.c
|
||||
index d6e28d3..f8f6950 100644
|
||||
--- a/src/job.c
|
||||
+++ b/src/job.c
|
||||
@@ -2391,7 +2391,7 @@ child_execute_job (struct childbase *child, int good_stdin, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
- cmd = (char *)find_in_given_path (argv[0], p, 0);
|
||||
+ cmd = (char *)find_in_given_path (argv[0], p, 0, false);
|
||||
}
|
||||
|
||||
if (!cmd)
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue