Skip to content

Commit db9d63a

Browse files
author
Yi Huang (from Dev Box)
committed
scope default toolchain file to onebranch/container build
1 parent 3b54185 commit db9d63a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

scripts/build.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -388,18 +388,18 @@ function CMake-Generate {
388388
if ($HostArch -ne $Arch) {
389389
if ($OneBranch) {
390390
$Arguments += " -DONEBRANCH=1"
391+
if ($ToolchainFile -eq "") {
392+
switch ($Arch) {
393+
"arm" { $ToolchainFile = "cmake/toolchains/arm-linux.cmake" }
394+
"arm64" { $ToolchainFile = "cmake/toolchains/aarch64-linux.cmake" }
395+
}
396+
}
391397
}
392398
$Arguments += " -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_CROSSCOMPILING=1 -DCMAKE_SYSROOT=$SysRoot"
393399
switch ($Arch) {
394400
"arm64" { $Arguments += " -DCMAKE_CXX_COMPILER_TARGET=aarch64-linux-gnu -DCMAKE_C_COMPILER_TARGET=aarch64-linux-gnu -DCMAKE_TARGET_ARCHITECTURE=arm64" }
395401
"arm" { $Arguments += " -DCMAKE_CXX_COMPILER_TARGET=arm-linux-gnueabihf -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabihf -DCMAKE_TARGET_ARCHITECTURE=arm" }
396402
}
397-
if ($ToolchainFile -eq "") {
398-
switch ($Arch) {
399-
"arm" { $ToolchainFile = "cmake/toolchains/arm-linux.cmake" }
400-
"arm64" { $ToolchainFile = "cmake/toolchains/aarch64-linux.cmake" }
401-
}
402-
}
403403
}
404404
}
405405
if ($ToolchainFile -ne "") {

0 commit comments

Comments
 (0)