mirror of
https://github.com/VSadov/Satori.git
synced 2025-06-10 01:50:53 +09:00
This reverts commit 9c3f8b3727
.
This commit is contained in:
parent
4ceefab87d
commit
0c7c10ee60
4 changed files with 3 additions and 16 deletions
|
@ -68,9 +68,6 @@ if (MSVC)
|
||||||
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:CLR_EH_OPTION>>)
|
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:CLR_EH_OPTION>>)
|
||||||
add_link_options($<$<BOOL:$<TARGET_PROPERTY:CLR_CONTROL_FLOW_GUARD>>:/guard:cf>)
|
add_link_options($<$<BOOL:$<TARGET_PROPERTY:CLR_CONTROL_FLOW_GUARD>>:/guard:cf>)
|
||||||
|
|
||||||
# Load all imported DLLs from the System32 directory.
|
|
||||||
add_linker_flag(/DEPENDENTLOADFLAG:0x800)
|
|
||||||
|
|
||||||
# Linker flags
|
# Linker flags
|
||||||
#
|
#
|
||||||
set (WINDOWS_SUBSYSTEM_VERSION 6.01)
|
set (WINDOWS_SUBSYSTEM_VERSION 6.01)
|
||||||
|
|
|
@ -64,10 +64,6 @@ if (CLR_CMAKE_HOST_WIN32)
|
||||||
remove_ijw_incompatible_options("${dirCompileOptions}" dirCompileOptions)
|
remove_ijw_incompatible_options("${dirCompileOptions}" dirCompileOptions)
|
||||||
set_directory_properties(PROPERTIES COMPILE_OPTIONS "${dirCompileOptions}")
|
set_directory_properties(PROPERTIES COMPILE_OPTIONS "${dirCompileOptions}")
|
||||||
|
|
||||||
# IJW tests needs to load DLLs from somewhere other than System32
|
|
||||||
string(REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
|
|
||||||
string(REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
|
|
||||||
|
|
||||||
set(CLR_SDK_REF_PACK_OUTPUT "")
|
set(CLR_SDK_REF_PACK_OUTPUT "")
|
||||||
set(CLR_SDK_REF_PACK_DISCOVERY_ERROR "")
|
set(CLR_SDK_REF_PACK_DISCOVERY_ERROR "")
|
||||||
set(CLR_SDK_REF_PACK_DISCOVERY_RESULT 0)
|
set(CLR_SDK_REF_PACK_DISCOVERY_RESULT 0)
|
||||||
|
|
|
@ -433,10 +433,6 @@ if %__BuildNative% EQU 1 (
|
||||||
goto ExitWithCode
|
goto ExitWithCode
|
||||||
)
|
)
|
||||||
|
|
||||||
@REM Temporarily disabling PGO until updated files with new linker flag are available.
|
|
||||||
@REM https://github.com/dotnet/runtime/pull/89311
|
|
||||||
GOTO :SkipNativeBuild
|
|
||||||
|
|
||||||
if %__EnforcePgo% EQU 1 (
|
if %__EnforcePgo% EQU 1 (
|
||||||
set PgoCheckCmd="!PYTHON!" "!__ProjectDir!\scripts\pgocheck.py" "!__BinDir!\coreclr.dll" "!__BinDir!\clrjit.dll"
|
set PgoCheckCmd="!PYTHON!" "!__ProjectDir!\scripts\pgocheck.py" "!__BinDir!\coreclr.dll" "!__BinDir!\clrjit.dll"
|
||||||
echo !PgoCheckCmd!
|
echo !PgoCheckCmd!
|
||||||
|
|
|
@ -59,11 +59,9 @@ function(add_pgo TargetName)
|
||||||
message("Cannot use PGO optimization built with Ninja from MSBuild. Re-run build with Ninja to apply PGO information")
|
message("Cannot use PGO optimization built with Ninja from MSBuild. Re-run build with Ninja to apply PGO information")
|
||||||
else(NOT EXISTS ${ProfilePath})
|
else(NOT EXISTS ${ProfilePath})
|
||||||
if(CLR_CMAKE_HOST_WIN32)
|
if(CLR_CMAKE_HOST_WIN32)
|
||||||
# Temporarily disabling PGO until updated files with new linker flag are available.
|
set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELEASE " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
|
||||||
# https://github.com/dotnet/runtime/pull/89311
|
set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELWITHDEBINFO " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
|
||||||
# set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELEASE " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
|
add_compile_definitions(WITH_NATIVE_PGO)
|
||||||
# set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELWITHDEBINFO " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
|
|
||||||
# add_compile_definitions(WITH_NATIVE_PGO)
|
|
||||||
else(CLR_CMAKE_HOST_WIN32)
|
else(CLR_CMAKE_HOST_WIN32)
|
||||||
if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELWITHDEBINFO)
|
if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELWITHDEBINFO)
|
||||||
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16))
|
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue