diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2023-07-26 09:47:22 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2023-07-26 09:49:44 +0200 |
| commit | a6093ed48cad2217ffe22555d1f1403854418dcb (patch) | |
| tree | a86a45938328e2d7889d1cfeb85a26247bf0eb91 | |
| parent | 3ce512ab512339db8172e9f86c885b5ffd098a9c (diff) | |
Fixed CI.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rw-r--r-- | Makefile.inc | 16 | ||||
| -rw-r--r-- | Makefile.native.inc | 6 |
4 files changed, 24 insertions, 9 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index db6794b..79ab297 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,6 +20,7 @@ jobs: LOCAL_MINGW64_CC=/usr/bin/x86_64-w64-mingw32-gcc \ LOCAL_MINGW64_CXX=/usr/bin/x86_64-w64-mingw32-g++ \ LOCAL_MINGW64_RC=/usr/bin/x86_64-w64-mingw32-windres \ + LOCAL_MINGW64_AR=/usr/bin/x86_64-w64-mingw32-ar \ DDK_INCLUDE_DIR=/usr/x86_64-w64-mingw32/include/ddk - run: | test -r EASTL-build/libEASTL.a @@ -29,6 +30,7 @@ jobs: LOCAL_MINGW64_CC=/usr/bin/x86_64-w64-mingw32-gcc \ LOCAL_MINGW64_CXX=/usr/bin/x86_64-w64-mingw32-g++ \ LOCAL_MINGW64_RC=/usr/bin/x86_64-w64-mingw32-windres \ + LOCAL_MINGW64_AR=/usr/bin/x86_64-w64-mingw32-ar \ DDK_INCLUDE_DIR=/usr/x86_64-w64-mingw32/include/ddk \ DESTDIR=$(realpath _install) - run: | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9eb6389..dd9261d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,8 +10,8 @@ cache: - mingw-w64-sysroot/ - EASTL-build/libEASTL.a - EASTL-native-build/libEASTL.a - - CRT/*.o - - CRT/*.opp + - CRT-build/* + - CRT-native-build/* before_script: - export DEBIAN_FRONTEND=noninteractive @@ -28,7 +28,10 @@ makedeps: - > { 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 CRT-build/libcrt.a && \ + test -r CRT-build/libcrt.a && \ + test -r CRT-build/libcxxrt.a && \ + test -r CRT-build/libusercrt.a && \ test -r EASTL-build/libEASTL.a && \ test -r EASTL-native-build/libEASTL.a; } || \ { make deps JOBS=${BUILDJOBS:-4} Q= || { cat mingw-w64-sysroot/build.log; false; }; } diff --git a/Makefile.inc b/Makefile.inc index 9f83eb8..24c907b 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -108,9 +108,19 @@ path_exists = \ $(error ERROR: $1 does not exist, run `make -C $(DPP_ROOT) deps` first.)) define CHECK_REQUIRED_PATHS + $(call is_set,$(CC),Makefile argument CC missing) + $(call is_set,$(CXX),Makefile argument CXX missing) + $(call is_set,$(RC),Makefile argument RC missing) + $(call is_set,$(AR),Makefile argument AR missing) + $(call is_set,$(DDK_INCLUDE_DIR),Makefile argument DDK_INCLUDE_DIR missing) + $(call is_set,$(EASTL_STATIC_LIB),Makefile argument EASTL_STATIC_LIB missing) + $(call is_set,$(LIBCRT_STATIC_LIB),Makefile argument LIBCRT_STATIC_LIB missing) + $(call is_set,$(LIBCXXRT_STATIC_LIB),Makefile argument LIBCXXRT_STATIC_LIB missing) + $(call is_set,$(LIBUSERCRT_STATIC_LIB),Makefile argument LIBUSERCRT_STATIC_LIB missing) $(call path_exists,$(CC)) $(call path_exists,$(CXX)) $(call path_exists,$(RC)) + $(call path_exists,$(AR)) $(call path_exists,$(DDK_INCLUDE_DIR)) $(call path_exists,$(EASTL_STATIC_LIB)) $(call path_exists,$(LIBCRT_STATIC_LIB)) @@ -243,7 +253,6 @@ define INSTALL_HEADERS done endef -ifneq ($(AR),) define PACKAGE $(call is_set,$(1),First argument: Library name missing) $(call is_set,$(2),Second argument: Object files missing) @@ -252,11 +261,6 @@ define PACKAGE $(AR) -rsv '$(3)/lib/lib$(1).a' $(2) tar --no-acls --no-selinux --no-xattrs --transform 's,^$(3),deps,' -cvjf '$(1).dpp' '$(3)' endef -else -define PACKAGE - $(error The tool AR is required for this operation.) -endef -endif define HELP_MAKE_OPTIONS @echo 'Common make options for Makefile.inc:' diff --git a/Makefile.native.inc b/Makefile.native.inc index 1e45d36..78b0f1c 100644 --- a/Makefile.native.inc +++ b/Makefile.native.inc @@ -53,8 +53,14 @@ path_exists = \ $(error ERROR: $1 does not exist, run `make -C $(DPP_ROOT) deps` first.)) define CHECK_REQUIRED_PATHS + $(call is_set,$(CC),Makefile argument CC missing) + $(call is_set,$(CXX),Makefile argument CXX missing) + $(call is_set,$(AR),Makefile argument AR missing) + $(call is_set,$(EASTL_STATIC_LIB),Makefile argument EASTL_STATIC_LIB missing) + $(call is_set,$(LIBUSERCRT_STATIC_LIB),Makefile argument LIBUSERCRT_STATIC_LIB missing) $(call path_exists,$(CC)) $(call path_exists,$(CXX)) + $(call path_exists,$(AR)) $(call path_exists,$(EASTL_STATIC_LIB)) $(call path_exists,$(LIBUSERCRT_STATIC_LIB)) endef |