File tree Expand file tree Collapse file tree 3 files changed +11
-4
lines changed Expand file tree Collapse file tree 3 files changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -787,6 +787,13 @@ if (CLR_CMAKE_HOST_WIN32)
787
787
endif ()
788
788
789
789
elseif (NOT CLR_CMAKE_HOST_BROWSER )
790
+ # This is a workaround for upstream issue: https://gitlab.kitware.com/cmake/cmake/-/issues/22995.
791
+ #
792
+ # In Clang.cmake, the decision to use single or double hyphen for target and gcc-toolchain is made
793
+ # based on CMAKE_${LANG}_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN, but CMAKE_ASM_COMPILER_VERSION is empty
794
+ # so it picks up single hyphen options, which new clang versions don't recognize.
795
+ set (CMAKE_ASM_COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION} " )
796
+
790
797
enable_language (ASM )
791
798
792
799
endif (CLR_CMAKE_HOST_WIN32 )
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ if (CLR_CMAKE_HOST_WIN32)
32
32
endfunction ()
33
33
34
34
# 4365 - signed/unsigned mismatch
35
- # 4679 - Could not import member. This is an issue with IJW and static abstract methods in interfaces.
35
+ # 4679 - Could not import member. This is an issue with IJW and static abstract methods in interfaces.
36
36
add_compile_options (/wd4365 /wd4679 )
37
37
38
38
# IJW
Original file line number Diff line number Diff line change @@ -68,11 +68,11 @@ case "$CPUName" in
68
68
69
69
s390x)
70
70
arch=s390x
71
- ;;
71
+ ;;
72
72
73
73
ppc64le)
74
- arch=ppc64le
75
- ;;
74
+ arch=ppc64le
75
+ ;;
76
76
* )
77
77
echo " Unknown CPU $CPUName detected!"
78
78
exit 1
You can’t perform that action at this time.
0 commit comments