summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorMichelle McDaniel <adiaaida@gmail.com>2016-08-22 11:01:41 -0700
committerMichelle McDaniel <adiaaida@gmail.com>2016-08-23 09:08:32 -0700
commita69d5a89a1c018f9179c0f02eca1e995cd52cf9b (patch)
tree37c0105f00a86512d53fde5732b126ae32fa3ae2 /build.sh
parent158db015291e012bb79c6eba15718834cb4ae173 (diff)
downloadcoreclr-a69d5a89a1c018f9179c0f02eca1e995cd52cf9b.tar.gz
coreclr-a69d5a89a1c018f9179c0f02eca1e995cd52cf9b.tar.bz2
coreclr-a69d5a89a1c018f9179c0f02eca1e995cd52cf9b.zip
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.
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh7
1 files changed, 6 insertions, 1 deletions
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=
;;