Unify command line arg for portable RID build (dotnet/coreclr#10408)

Commit migrated from https://github.com/dotnet/coreclr/commit/14792ccacd1209380ba642431fe22f703b9f4060

diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd
index 13c3fb4..859eac7 100644 (file)
--- a/src/coreclr/build.cmd
+++ b/src/coreclr/build.cmd
@@ -118,7 +118,7 @@ if /i "%1" == "debug"               (set __BuildTypeDebug=1&set processedArgs=!p
 if /i "%1" == "checked"             (set __BuildTypeChecked=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "release"             (set __BuildTypeRelease=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 
-if /i "%1" == "portable"             (set __IsPortableBuild=-portable&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+if /i "%1" == "-portable"             (set __IsPortableBuild=-portable&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 
 REM All arguments after this point will be passed through directly to build.cmd on nested invocations
 REM using the "all" argument, and must be added to the __PassThroughArgs variable.

diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh
index 7c5f55b..e97fbb0 100755 (executable)
--- a/src/coreclr/build.sh
+++ b/src/coreclr/build.sh
@@ -634,7 +634,7 @@ while :; do
             __CrossBuild=1
             ;;
             
-        portable)
+        -portable)
             __PortableBuild=1
             ;;
 

diff --git a/src/coreclr/config.json b/src/coreclr/config.json
index f0780ed..9d98a2e 100644 (file)
--- a/src/coreclr/config.json
+++ b/src/coreclr/config.json
@@ -621,6 +621,12 @@
             "__BuildArch": "default"
           }
         },
+        "portable": {
+          "description": "Triggers a portable build.",
+          "settings": {
+            "PortableBuild": "1"
+          }
+        },
         "buildType": {
           "description": "Specifies configuration to publish, can be Release, Debug or Checked.",
           "settings": {