NephNET/builder-cross-windows
NephNET
/
builder-cross-windows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity

bring msvc toolchains in line with others

This commit is contained in:
Daniel Wolf 2023-11-05 11:09:57 -05:00
parent 3b7c63c156
commit 5cbcc61ed4
Signed by: nephatrine
GPG Key ID: 59D70EC2E4AAB4D0
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
override/opt/llvm-msvc/share/nxbuild/windows-aarch64.cmake
View File

@ -25,8 +25,11 @@ find_program(CMAKE_LINKER NAMES "lld-link-$ENV{LLVM_MAJOR}" "lld-link")
set(CMAKE_LIBRARY_ARCHITECTURE "${CMAKE_VS_PLATFORM_NAME}")
set(CMAKE_C_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
set(CMAKE_CXX_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
set(CMAKE_ASM_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
set(MSVC_C_ARCHITECTURE_ID "${CMAKE_VS_PLATFORM_NAME}")
set(MSVC_CXX_ARCHITECTURE_ID "${CMAKE_VS_PLATFORM_NAME}")
set(MSVC_ASM_ARCHITECTURE_ID "${CMAKE_VS_PLATFORM_NAME}")
string(REPLACE "." ";" lsVSTools "$ENV{VCToolsVersion}")
list(GET lsVSTools 0 iVCMajor)
@ -34,11 +37,12 @@ list(GET lsVSTools 1 iVCMinor)
math(EXPR iVCMajor "${iVCMajor} + 5")
set(CMAKE_C_COMPILER_TARGET "${triplet}")
set(CMAKE_C_FLAGS_INIT "--target=${CMAKE_C_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_CXX_COMPILER_TARGET "${triplet}")
set(CMAKE_CXX_FLAGS_INIT "--target=${CMAKE_CXX_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_ASM_COMPILER_TARGET "${triplet}")
set(CMAKE_ASM_FLAGS_INIT "${CMAKE_C_FLAGS_INIT}")
set(CMAKE_C_FLAGS_INIT "--target=${CMAKE_C_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_CXX_FLAGS_INIT "--target=${CMAKE_CXX_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_ASM_FLAGS_INIT "--target=${CMAKE_ASM_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-imsvc")
set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-imsvc")

10
override/opt/llvm-msvc/share/nxbuild/windows-i686.cmake
View File

@ -26,8 +26,11 @@ find_program(CMAKE_LINKER NAMES "lld-link-$ENV{LLVM_MAJOR}" "lld-link")
set(CMAKE_LIBRARY_ARCHITECTURE "${CMAKE_VS_PLATFORM_NAME}")
set(CMAKE_C_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
set(CMAKE_CXX_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
set(CMAKE_ASM_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
set(MSVC_C_ARCHITECTURE_ID "${CMAKE_VS_PLATFORM_NAME}")
set(MSVC_CXX_ARCHITECTURE_ID "${CMAKE_VS_PLATFORM_NAME}")
set(MSVC_ASM_ARCHITECTURE_ID "${CMAKE_VS_PLATFORM_NAME}")
string(REPLACE "." ";" lsVSTools "$ENV{VCToolsVersion}")
list(GET lsVSTools 0 iVCMajor)
@ -35,11 +38,12 @@ list(GET lsVSTools 1 iVCMinor)
math(EXPR iVCMajor "${iVCMajor} + 5")
set(CMAKE_C_COMPILER_TARGET "${triplet}")
set(CMAKE_C_FLAGS_INIT "--target=${CMAKE_C_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_CXX_COMPILER_TARGET "${triplet}")
set(CMAKE_CXX_FLAGS_INIT "--target=${CMAKE_CXX_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_ASM_COMPILER_TARGET "${triplet}")
set(CMAKE_ASM_FLAGS_INIT "${CMAKE_C_FLAGS_INIT}")
set(CMAKE_C_FLAGS_INIT "--target=${CMAKE_C_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_CXX_FLAGS_INIT "--target=${CMAKE_CXX_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_ASM_FLAGS_INIT "--target=${CMAKE_ASM_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-imsvc")
set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-imsvc")

10
override/opt/llvm-msvc/share/nxbuild/windows-x86_64.cmake
View File

@ -26,8 +26,11 @@ find_program(CMAKE_LINKER NAMES "lld-link-$ENV{LLVM_MAJOR}" "lld-link")
set(CMAKE_LIBRARY_ARCHITECTURE "${CMAKE_VS_PLATFORM_NAME}")
set(CMAKE_C_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
set(CMAKE_CXX_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
set(CMAKE_ASM_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}")
set(MSVC_C_ARCHITECTURE_ID "${CMAKE_VS_PLATFORM_NAME}")
set(MSVC_CXX_ARCHITECTURE_ID "${CMAKE_VS_PLATFORM_NAME}")
set(MSVC_ASM_ARCHITECTURE_ID "${CMAKE_VS_PLATFORM_NAME}")
string(REPLACE "." ";" lsVSTools "$ENV{VCToolsVersion}")
list(GET lsVSTools 0 iVCMajor)
@ -35,11 +38,12 @@ list(GET lsVSTools 1 iVCMinor)
math(EXPR iVCMajor "${iVCMajor} + 5")
set(CMAKE_C_COMPILER_TARGET "${triplet}")
set(CMAKE_C_FLAGS_INIT "--target=${CMAKE_C_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_CXX_COMPILER_TARGET "${triplet}")
set(CMAKE_CXX_FLAGS_INIT "--target=${CMAKE_CXX_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_ASM_COMPILER_TARGET "${triplet}")
set(CMAKE_ASM_FLAGS_INIT "${CMAKE_C_FLAGS_INIT}")
set(CMAKE_C_FLAGS_INIT "--target=${CMAKE_C_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_CXX_FLAGS_INIT "--target=${CMAKE_CXX_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_ASM_FLAGS_INIT "--target=${CMAKE_ASM_COMPILER_TARGET} -fms-compatibility-version=${iVCMajor}.${iVCMinor} -vctoolsversion $ENV{VCToolsVersion} -winsdkversion $ENV{WindowsSDKVersion}")
set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-imsvc")
set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-imsvc")