From b5a8e0cb48de3dc9790e5b8bdac8ea602205f261 Mon Sep 17 00:00:00 2001 From: Lukas Kurz Date: Sat, 4 Oct 2025 13:49:11 +0200 Subject: [PATCH 1/3] chore: fix linux build --- pal/src/cruntime/finite.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pal/src/cruntime/finite.cpp b/pal/src/cruntime/finite.cpp index 54b32279913..e19fddd0d55 100644 --- a/pal/src/cruntime/finite.cpp +++ b/pal/src/cruntime/finite.cpp @@ -19,9 +19,9 @@ Module Name: --*/ +#include #include "pal/palinternal.h" #include "pal/dbgmsg.h" -#include #if HAVE_IEEEFP_H #include From 5b13d5623f27d4cabf08144642ee3130bdbaa331 Mon Sep 17 00:00:00 2001 From: Lukas Kurz Date: Sat, 4 Oct 2025 13:56:22 +0200 Subject: [PATCH 2/3] Fix copyright --- pal/src/cruntime/finite.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pal/src/cruntime/finite.cpp b/pal/src/cruntime/finite.cpp index e19fddd0d55..cf8d2f4e4c0 100644 --- a/pal/src/cruntime/finite.cpp +++ b/pal/src/cruntime/finite.cpp @@ -1,7 +1,10 @@ -// -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// +//------------------------------------------------------------------------------------------------------- +// ChakraCore/Pal +// Contains portions (c) copyright Microsoft, portions copyright (c) the .NET Foundation and Contributors +// and edits (c) copyright the ChakraCore Contributors. +// See THIRD-PARTY-NOTICES.txt in the project root for .NET Foundation license +// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information. +//------------------------------------------------------------------------------------------------------- /*++ From 4c09a123e515f94da897b3bafcd29f889c78a33b Mon Sep 17 00:00:00 2001 From: Lukas Kurz Date: Sat, 4 Oct 2025 12:17:10 +0200 Subject: [PATCH 3/3] Use CMake 3.10 --- CMakeLists.txt | 6 +++--- lib/wabt/CMakeLists.txt | 2 +- lib/wabt/README.md | 2 +- pal/CMakeLists.txt | 2 +- pal/src/CMakeLists.txt | 2 +- tools/RecyclerChecker/CMakeLists.txt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd077075d4a..7d20996a3f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.10) project (CHAKRACORE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g") @@ -372,7 +372,8 @@ if(CLR_CMAKE_PLATFORM_XPLAT) -D__STDC_WANT_LIB_EXT1__=1 ) - set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED On) # todo: fix general visibility of the interface # do not set to `fvisibility=hidden` as it is going to @@ -390,7 +391,6 @@ if(CLR_CMAKE_PLATFORM_XPLAT) -Wno-invalid-offsetof\ -Wno-undefined-inline\ -Wno-inconsistent-missing-override\ - -Wno-c++14-extensions\ -Wno-macro-redefined\ -Wno-pragmas\ -Wno-invalid-token-paste\ diff --git a/lib/wabt/CMakeLists.txt b/lib/wabt/CMakeLists.txt index 994533f300e..1ea2dbf812e 100644 --- a/lib/wabt/CMakeLists.txt +++ b/lib/wabt/CMakeLists.txt @@ -14,7 +14,7 @@ # limitations under the License. # -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.10) project(WABT) set(COMPILER_IS_CLANG 1) diff --git a/lib/wabt/README.md b/lib/wabt/README.md index 80aca09e83e..f5516885c16 100644 --- a/lib/wabt/README.md +++ b/lib/wabt/README.md @@ -44,7 +44,7 @@ This will fetch the testsuite and gtest repos, which are needed for some tests. You'll need [CMake](https://cmake.org). If you just run `make`, it will run CMake for you, and put the result in `out/clang/Debug/` by default: -> Note: If you are on macOS, you will need to use CMake version 3.2 or higher +> Note: If you are on macOS, you will need to use CMake version 3.10 or higher ```console $ make diff --git a/pal/CMakeLists.txt b/pal/CMakeLists.txt index 8e2d32f84b1..97508a45e97 100644 --- a/pal/CMakeLists.txt +++ b/pal/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.10) project(COREPAL) diff --git a/pal/src/CMakeLists.txt b/pal/src/CMakeLists.txt index ca062add292..50bf556541f 100644 --- a/pal/src/CMakeLists.txt +++ b/pal/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.10) project(chakrapal) diff --git a/tools/RecyclerChecker/CMakeLists.txt b/tools/RecyclerChecker/CMakeLists.txt index 3c7904f2b9c..c3365a893a6 100644 --- a/tools/RecyclerChecker/CMakeLists.txt +++ b/tools/RecyclerChecker/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.10) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) # set(CMAKE_VERBOSE_MAKEFILE on)