mirror of
https://github.com/reactos/buildbot_config.git
synced 2024-11-26 21:20:27 +00:00
[WORKER] Add workaround for VSCMD_* environment variables (#10)
Should fix MSVC_x64 build failing since 2ffcda90b2
This commit is contained in:
parent
90f80a36f7
commit
2b07c9c3c1
5
worker/configure
vendored
5
worker/configure
vendored
@ -25,6 +25,11 @@ cd $ROS_OUTPUT
|
|||||||
|
|
||||||
if which cl &>/dev/null; then
|
if which cl &>/dev/null; then
|
||||||
# MSVC environment
|
# MSVC environment
|
||||||
|
if [ "$ROS_ARCH" = "amd64" ]; then
|
||||||
|
export VSCMD_ARG_HOST_ARCH="x64"
|
||||||
|
export VSCMD_ARG_TGT_ARCH="x64"
|
||||||
|
fi
|
||||||
|
|
||||||
$TIME cmake -G 'Ninja' -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=$ROS_ARCH -DRUNTIME_CHECKS:BOOL=0 $@ $SOURCEDIR
|
$TIME cmake -G 'Ninja' -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=$ROS_ARCH -DRUNTIME_CHECKS:BOOL=0 $@ $SOURCEDIR
|
||||||
else
|
else
|
||||||
# GCC environment
|
# GCC environment
|
||||||
|
Loading…
Reference in New Issue
Block a user