summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorMichelle McDaniel <adiaaida@gmail.com>2018-09-07 13:08:25 -0700
committerGitHub <noreply@github.com>2018-09-07 13:08:25 -0700
commitd81a3685df482e8962bf696e44b9071f19bfac2f (patch)
treefd004c0fc82058ed92a3907fc70c967c9dc68623 /build.sh
parent36449cf94237e7cddb7e43a9fe6f873e7f5ebf77 (diff)
downloadcoreclr-d81a3685df482e8962bf696e44b9071f19bfac2f.tar.gz
coreclr-d81a3685df482e8962bf696e44b9071f19bfac2f.tar.bz2
coreclr-d81a3685df482e8962bf696e44b9071f19bfac2f.zip
Fix the slashes when setting the ZapBBInstrDir (#19858)
In OpenMethodProfileDataLogFile, we try to set the directory and path for the .ibc files using windows slashes (\). This causes this code to fail on Linux, which uses forward slashes. This is particularly a problem when setting COMPlus_ZapBBInstrDir, which takes that environment variable and attempts to find the name of the file using wcsrchr(assemblyPath, '\'). This causes a crash on linux when collecting IBC counts. The fix is to ifdef it for linux to use the correct path separator. This change also includes a fix to change the code for checking if IbcTuning is set to use == instead of -eq which was causing a failure in the build that was ignored.
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index 6c40251839..f49106330c 100755
--- a/build.sh
+++ b/build.sh
@@ -454,7 +454,7 @@ build_CoreLib()
# Invoke MSBuild
__ExtraBuildArgs=""
- if [[ "$__IbcTuning" -eq "" ]]; then
+ if [[ "$__IbcTuning" == "" ]]; then
__ExtraBuildArgs="$__ExtraBuildArgs -OptimizationDataDir=\"$__PackagesDir/optimization.$__BuildOS-$__BuildArch.IBC.CoreCLR/$__IbcOptDataVersion/data/\""
__ExtraBuildArgs="$__ExtraBuildArgs -EnableProfileGuidedOptimization=true"
fi