From 78b246f4babe6ee1cc6235c4c9b04e00f668cb93 Mon Sep 17 00:00:00 2001 From: Michelle McDaniel Date: Mon, 22 Aug 2016 11:01:41 -0700 Subject: [PATCH] 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. Commit migrated from https://github.com/dotnet/coreclr/commit/a69d5a89a1c018f9179c0f02eca1e995cd52cf9b --- src/coreclr/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index 6a0a5b0..96c0278 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/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= ;; -- 2.7.4