diff options
| author | Hanjoung Lee <hanjoung.lee@samsung.com> | 2016-05-26 19:12:47 +0900 |
|---|---|---|
| committer | Hanjoung Lee <hanjoung.lee@samsung.com> | 2016-05-26 19:13:24 +0900 |
| commit | 4f45805f772496ada97756719cf40e5767deeb84 (patch) | |
| tree | 5072cc9120727902ce982008d29ee1ff1f44c437 | |
| parent | 68b7bfa4df2d08019c3b320d6fbc4a85838f0d47 (diff) | |
| download | coreclr-4f45805f772496ada97756719cf40e5767deeb84.tar.gz coreclr-4f45805f772496ada97756719cf40e5767deeb84.tar.bz2 coreclr-4f45805f772496ada97756719cf40e5767deeb84.zip | |
Support CoreLib build for arm-softfp
`arm-softfp` CoreLib is same as `arm` version.
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | src/mscorlib/System.Private.CoreLib.csproj | 3 | ||||
| -rw-r--r-- | src/mscorlib/facade/mscorlib.csproj | 3 | ||||
| -rw-r--r-- | src/mscorlib/mscorlib.csproj | 3 |
4 files changed, 7 insertions, 4 deletions
@@ -232,7 +232,7 @@ isMSBuildOnNETCoreSupported() elif [ "$__BuildOS" == "OSX" ]; then __isMSBuildOnNETCoreSupported=1 fi - elif [ "$__BuildArch" == "arm" ] || [ "$__BuildArch" == "arm64" ] ; then + elif [ "$__BuildArch" == "arm" ] || [ "$__BuildArch" == "arm-softfp" ] || [ "$__BuildArch" == "arm64" ] ; then if [ "$__BuildOS" == "Linux" ]; then if [ "$__DistroName" == "ubuntu" ]; then __isMSBuildOnNETCoreSupported=1 diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj index f44944ec1a..4529f45657 100644 --- a/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/mscorlib/System.Private.CoreLib.csproj @@ -7,12 +7,13 @@ <!-- Compilation options --> <PropertyGroup> - <AvailablePlatforms>amd64,x86,arm,arm64</AvailablePlatforms> + <AvailablePlatforms>amd64,x86,arm,arm-softfp,arm64</AvailablePlatforms> <Configuration Condition=" '$(Configuration)' == '' ">$(BuildType)</Configuration> <Platform Condition=" '$(Platform)' == '' ">$(BuildArch)</Platform> <!-- The CLR properties use amd64 as their platform string, we want to keep in sync with those, so set Platform appropriately, though still use the 'x64' output path (see use of BuildArch below) --> <Platform Condition=" '$(Platform)' == 'x64' ">amd64</Platform> + <Platform Condition=" '$(Platform)' == 'arm-softfp' ">arm</Platform> <ProjectGuid>{3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}</ProjectGuid> <OutputType>Library</OutputType> diff --git a/src/mscorlib/facade/mscorlib.csproj b/src/mscorlib/facade/mscorlib.csproj index 9806ee0111..a3d673f277 100644 --- a/src/mscorlib/facade/mscorlib.csproj +++ b/src/mscorlib/facade/mscorlib.csproj @@ -19,12 +19,13 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> - <AvailablePlatforms>amd64,x86,arm,arm64</AvailablePlatforms> + <AvailablePlatforms>amd64,x86,arm,arm-softfp,arm64</AvailablePlatforms> <Configuration Condition=" '$(Configuration)' == '' ">$(BuildType)</Configuration> <Platform Condition=" '$(Platform)' == '' ">$(BuildArch)</Platform> <!-- The CLR properties use amd64 as their platform string, we want to keep in sync with those, so set Platform appropriately, though still use the 'x64' output path (see use of BuildArch below) --> <Platform Condition=" '$(Platform)' == 'x64' ">amd64</Platform> + <Platform Condition=" '$(Platform)' == 'arm-softfp' ">arm</Platform> </PropertyGroup> <!-- Default configurations to help VS understand the options --> diff --git a/src/mscorlib/mscorlib.csproj b/src/mscorlib/mscorlib.csproj index 9f5615dbfc..eca1790ea5 100644 --- a/src/mscorlib/mscorlib.csproj +++ b/src/mscorlib/mscorlib.csproj @@ -7,12 +7,13 @@ <!-- Compilation options --> <PropertyGroup> - <AvailablePlatforms>amd64,x86,arm,arm64</AvailablePlatforms> + <AvailablePlatforms>amd64,x86,arm,arm-softfp,arm64</AvailablePlatforms> <Configuration Condition=" '$(Configuration)' == '' ">$(BuildType)</Configuration> <Platform Condition=" '$(Platform)' == '' ">$(BuildArch)</Platform> <!-- The CLR properties use amd64 as their platform string, we want to keep in sync with those, so set Platform appropriately, though still use the 'x64' output path (see use of BuildArch below) --> <Platform Condition=" '$(Platform)' == 'x64' ">amd64</Platform> + <Platform Condition=" '$(Platform)' == 'arm-softfp' ">arm</Platform> <ProjectGuid>{3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}</ProjectGuid> <OutputType>Library</OutputType> |