Fix csproj

Commit migrated from https://github.com/mono/mono/commit/4212270b231bcc158f75fd19a4503eac979032ec

diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
index b734525..e7cf77c 100644 (file)
--- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -28,8 +28,8 @@
 
   <!-- Compilation options -->
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">$(BuildType)</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">$(BuildArch)</Platform>
+    <Configuration Condition=" '$(BuildType)' != '' ">$(BuildType)</Configuration>
+    <Platform Condition=" '$(BuildArch)' != '' ">$(BuildArch)</Platform>
     <Platform Condition=" '$(Platform)' == 'armel' ">arm</Platform>
     <ProjectGuid>{DD18B4BA-3B49-437B-9E34-41EF8A640CE0}</ProjectGuid>
 

diff --git a/src/mono/netcore/build.sh b/src/mono/netcore/build.sh
index 29071f8..712c305 100755 (executable)
--- a/src/mono/netcore/build.sh
+++ b/src/mono/netcore/build.sh
@@ -83,6 +83,7 @@ while [[ $# > 0 ]]; do
   shift
 done
 
+CPU_COUNT=$(getconf _NPROCESSORS_ONLN || echo 4)
 
 # run .././autogen.sh only once or if "--rebuild" argument is provided
 if [[ "$force_rebuild" == "true" || ! -f .configured ]]; then
@@ -92,8 +93,6 @@ if [[ "$force_rebuild" == "true" || ! -f .configured ]]; then
   touch .configured
 fi
 
-CPU_COUNT=$(getconf _NPROCESSORS_ONLN || echo 4)
-
 # build mono runtime
 if [ "$skipnative" = "false" ]; then
   make runtime -j$CPU_COUNT