From a05fc04fce8d8f238fcbebd812b27c2ab5633be8 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 2 Feb 2015 13:39:10 -0800 Subject: [PATCH 1/2] Pass correct arguments to CMake for linux release build --- build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 4a10dba0f4f4..5057466f503f 100755 --- a/build.sh +++ b/build.sh @@ -68,7 +68,7 @@ build_coreclr() cd $__CMakeSlnDir # Regenerate the CMake solution - $__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh $__VBL_ROOT + $__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh $__VBL_ROOT $__CMakeArgs # Check that the makefiles were created. @@ -79,6 +79,7 @@ build_coreclr() # Build CoreCLR + echo Executing make $__UnprocessedBuildArgs make $__UnprocessedBuildArgs if [ $? != 0 ]; then echo Failed to build coreclr components. @@ -101,6 +102,7 @@ __VBL_ROOT="$__ProjectRoot" __BuildArch=amd64 __MSBuildBuildArch=x64 __BuildType=debug +__CMakeArgs=DEBUG # Set the various build properties here so that CMake and MSBuild can pick them up __ProjectDir="$__ProjectRoot" @@ -129,6 +131,7 @@ for i in "$@" ;; release) __BuildType=release + __CMakeArgs=RELEASE ;; clean) __CleanBuild=true From 406e6b5abb33132a032c0f314eac78d8e21e81e5 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 2 Feb 2015 13:45:11 -0800 Subject: [PATCH 2/2] Add a bit more logging and remove meaningless VBL_ROOT parameter --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 5057466f503f..44b12241d156 100755 --- a/build.sh +++ b/build.sh @@ -68,7 +68,8 @@ build_coreclr() cd $__CMakeSlnDir # Regenerate the CMake solution - $__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh $__VBL_ROOT $__CMakeArgs + echo Invoking cmake with arguments: $__ProjectRoot $__CMakeArgs + $__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh $__ProjectRoot $__CMakeArgs # Check that the makefiles were created. @@ -98,7 +99,6 @@ echo Commencing CoreCLR Repo build # Obtain the location of the bash script to figure out whether the root of the repo is. __ProjectRoot=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -__VBL_ROOT="$__ProjectRoot" __BuildArch=amd64 __MSBuildBuildArch=x64 __BuildType=debug