Skip to content

Sync eng/native from runtime #3318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hoyosjs merged 4 commits into from
Aug 30, 2022
Merged

Sync eng/native from runtime #3318

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b91cc0d
Sync eng/native from runtime
am11 Aug 27, 2022
26c1114
Use VS2022 on Windows
am11 Aug 27, 2022
eec7e8d
Resync
am11 Aug 27, 2022
bacbf0f
Fix a comment
am11 Aug 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Resync
  • Loading branch information
@am11
am11 committed Aug 27, 2022
commit eec7e8dd45188db3b79660bc799f598ffa3bb8c3
7 changes: 7 additions & 0 deletions eng/native/configurecompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,13 @@ if (CLR_CMAKE_HOST_WIN32)
endif()

elseif (NOT CLR_CMAKE_HOST_BROWSER)
# This is a workaround for upstream issue: https://gitlab.kitware.com/cmake/cmake/-/issues/22995.
#
# In Clang.cmake, the decision to use single or double hyphen for target and gcc-toolchain is made
# based on CMAKE_${LANG}_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN, but CMAKE_ASM_COMPILER_VERSION is empty
# so it picks up single hyphen options, which new clang versions don't recognize.
set (CMAKE_ASM_COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION}")

enable_language(ASM)

endif(CLR_CMAKE_HOST_WIN32)
14 changes: 7 additions & 7 deletions eng/native/init-os-and-arch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ FreeBSD|Linux|NetBSD|OpenBSD|SunOS|Android)
Darwin)
os=OSX ;;
*)
echo "Unsupported OS $OSName detected, configuring as if for Linux"
os=Linux ;;
echo "Unsupported OS $OSName detected!"
exit 1 ;;
esac

# On Solaris, `uname -m` is discouraged, see https://docs.oracle.com/cd/E36784_01/html/E36870/uname-1.html
Expand Down Expand Up @@ -68,13 +68,13 @@ case "$CPUName" in

s390x)
arch=s390x
;;
;;

ppc64le)
arch=ppc64le
;;
arch=ppc64le
;;
*)
echo "Unknown CPU $CPUName detected, configuring as if for x64"
arch=x64
echo "Unknown CPU $CPUName detected!"
exit 1
;;
esac