diff options
-rw-r--r-- | configurecompiler.cmake | 6 | ||||
-rwxr-xr-x | packaging/coreclr.spec | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/configurecompiler.cmake b/configurecompiler.cmake index 5d5925c8bf..0f4594415e 100644 --- a/configurecompiler.cmake +++ b/configurecompiler.cmake @@ -572,6 +572,12 @@ if(CLR_CMAKE_PLATFORM_UNIX_ARM) endif(ARM_SOFTFP) endif(CLR_CMAKE_PLATFORM_UNIX_ARM) +if(CLR_CMAKE_PLATFORM_UNIX_ARM64) + if("$ENV{__DistroRid}" MATCHES "tizen.*") + add_compile_options(-target aarch64-tizen-linux-gnu) + endif() +endif(CLR_CMAKE_PLATFORM_UNIX_ARM64) + if(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(${CLR_ADDITIONAL_COMPILER_OPTIONS}) endif(CLR_CMAKE_PLATFORM_UNIX) diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec index 66bc49e350..77a5481855 100755 --- a/packaging/coreclr.spec +++ b/packaging/coreclr.spec @@ -18,8 +18,6 @@ URL: http://github.com/dotnet/coreclr Source0: %{name}-%{version}.tar.gz Source1: %{name}.manifest -ExcludeArch: aarch64 - BuildRequires: python BuildRequires: python-xml # libcoreclr.so @@ -62,7 +60,7 @@ BuildRequires: pkgconfig(lttng-ust) %if 0%{skipmscorlib} %else -%ifarch %{arm} +%ifarch %{arm} aarch64 BuildRequires: patchelf %endif %ifarch %{ix86} @@ -113,8 +111,7 @@ cp %{SOURCE1} . %if 0%{skipmscorlib} %else -%ifarch %{arm} %{ix86} -%ifarch %{arm} +%ifarch %{arm} aarch64 # Detect interpreter name from cross-gcc LD_INTERPRETER=$(patchelf --print-interpreter /emul/usr/bin/gcc) LD_RPATH=$(patchelf --print-rpath /emul/usr/bin/gcc) @@ -135,7 +132,6 @@ do done %endif %endif -%endif %build # disable asan build when global forced asan build |