summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjashook <jashoo@microsoft.com>2019-06-13 03:59:50 +0000
committerjashook <jashoo@microsoft.com>2019-06-13 03:59:50 +0000
commit5ca07f5369c881b0b2fde1518675d0a120c00b7e (patch)
tree85da7b60ddfe2c009a447e0c52fb54f0bba5c061
parentff5f14a7c3440ab918beb3aa5b1b14ec1dbaad68 (diff)
downloadcoreclr-5ca07f5369c881b0b2fde1518675d0a120c00b7e.tar.gz
coreclr-5ca07f5369c881b0b2fde1518675d0a120c00b7e.tar.bz2
coreclr-5ca07f5369c881b0b2fde1518675d0a120c00b7e.zip
Add ${__CommonMSBuildArgs} to pass buildtype and arch
-rw-r--r--build.cmd4
-rwxr-xr-xbuild.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/build.cmd b/build.cmd
index 8828901160..945d128014 100644
--- a/build.cmd
+++ b/build.cmd
@@ -390,7 +390,7 @@ if %__RestoreOptData% EQU 1 (
)
REM Parse the optdata package versions out of msbuild so that we can pass them on to CMake
-call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo
+call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo %__CommonMSBuildArgs%
if not exist "%__IntermediatesDir%\optdataversion.txt" (
echo "Failed to get PGO data package version."
@@ -399,7 +399,7 @@ if not exist "%__IntermediatesDir%\optdataversion.txt" (
set /p __PgoOptDataVersion<"%__IntermediatesDir%\optdataversion.txt"
-call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo
+call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo %__CommonMSBuildArgs%
if not exist "%__IntermediatesDir%\ibcoptdataversion.txt" (
echo "Failed to get PGO data package version."
diff --git a/build.sh b/build.sh
index 826ce97b3b..6738cf5e93 100755
--- a/build.sh
+++ b/build.sh
@@ -152,7 +152,7 @@ restore_optdata()
# Parse the optdata package versions out of msbuild so that we can pass them on to CMake
# Writes into ${__IntermediatesDir}/optdataversion.txt
- ${__ProjectDir}/dotnet.sh msbuild $OptDataProjectFilePath /t:DumpPgoDataPackageVersion /nologo 2>&1 >/dev/null
+ ${__ProjectDir}/dotnet.sh msbuild $OptDataProjectFilePath /t:DumpPgoDataPackageVersion ${__CommonMSBuildArgs} /nologo 2>&1 >/dev/null
if [ ! -f "${__IntermediatesDir}/optdataversion.txt" ]; then
echo "Failed to get PGO data package version."
exit $?
@@ -161,7 +161,7 @@ restore_optdata()
__PgoOptDataVersion=$(<"${__IntermediatesDir}/optdataversion.txt")
# Writes into ${__IntermediatesDir}/ibcoptdataversion.txt
- ${__ProjectDir}/dotnet.sh msbuild $OptDataProjectFilePath /t:DumpIbcDataPackageVersion /nologo 2>&1 >/dev/null
+ ${__ProjectDir}/dotnet.sh msbuild $OptDataProjectFilePath /t:DumpIbcDataPackageVersion ${__CommonMSBuildArgs} /nologo 2>&1 >/dev/null
if [ ! -f "${__IntermediatesDir}/ibcoptdataversion.txt" ]; then
echo "Failed to get IBC data package version."
exit $?