Skip to content

Commit 8893ba3

Browse files
committed
MicroBuild v2: Set the ObjectDirectory correctly in the environment.
Enables us to pick up Chakra.Generated.BuildInfo.props so that we can set the binary version and file info correctly.
1 parent 64e5de4 commit 8893ba3

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

Build/scripts/init_build.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ if ($BranchPath.StartsWith("build")) {
112112
$BuildIdentifier = "${buildPushIdString}_${PushDate}_${Username}_${CommitHash}"
113113
$ComputedDropPathSegment = "${BranchPath}\${YearAndMonth}${BuildIdentifier}"
114114
$BinariesDirectory = "${Env:BUILD_SOURCESDIRECTORY}\Build\VcBuild"
115+
$ObjectDirectory = "${BinariesDirectory}\obj\${BuildPlatform}_${BuildConfiguration}"
115116

116117
# Create a sentinel file for each build flavor to track whether the build is complete.
117118
# * ${arch}_${flavor}.incomplete # will be deleted when the build of this flavor completes
@@ -178,7 +179,7 @@ set TF_BUILD_SOURCEGETVERSION=LG:${branch}:${CommitHash}
178179
set TF_BUILD_DROPLOCATION=${BinariesDirectory}
179180
180181
set TF_BUILD_SOURCESDIRECTORY=${Env:BUILD_SOURCESDIRECTORY}
181-
REM set TF_BUILD_BUILDDIRECTORY=${Env:AGENT_BUILDDIRECTORY}\b # note: inferred location works
182+
set TF_BUILD_BUILDDIRECTORY=${ObjectDirectory}
182183
set TF_BUILD_BINARIESDIRECTORY=${BinariesDirectory}
183184
184185
set TF_BUILD_BUILDDEFINITIONNAME=${Env:BUILD_DEFINITIONNAME}

0 commit comments

Comments
 (0)