From a69d5a89a1c018f9179c0f02eca1e995cd52cf9b Mon Sep 17 00:00:00 2001
From: Michelle McDaniel <adiaaida@gmail.com>
Date: Mon, 22 Aug 2016 11:01:41 -0700
Subject: Fix ConfigureOnly option in build.sh

ConfigureOnly is intended to run the CMake to configure the build, but
nothing else. However, when you passed configureonly to build.sh, it set
__SkipConfigure=1, which made it skip the configure step of the build.
This change fixes that by removing that option from the options set my
configureonly, and adds a check right after configure and right before
running the build to exit if we are only configuring.
---
 build.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 6a0a5b0f3a..96c0278a4c 100755
--- a/build.sh
+++ b/build.sh
@@ -196,6 +196,11 @@ build_coreclr()
 
     # Build CoreCLR
 
+    if [ $__ConfigureOnly == 1 ]; then
+        echo "Skipping CoreCLR build."
+        return
+    fi
+
     echo "Executing $buildTool install -j $NumProc"
 
     $buildTool install -j $NumProc
@@ -537,8 +542,8 @@ while :; do
 
         configureonly)
             __ConfigureOnly=1
-            __SkipCoreCLR=1
             __SkipMSCorLib=1
+            __SkipNuget=1
             __IncludeTests=
             ;;
 
-- 
cgit v1.2.3