aboutsummaryrefslogtreecommitdiff
path: root/scripts/bootstrap.ps1
diff options
context:
space:
mode:
authornicole mazzuca <mazzucan@outlook.com>2020-08-06 17:04:47 -0700
committerGitHub <noreply@github.com>2020-08-06 17:04:47 -0700
commit40c8aab459f6692f68daa0ef431b80ca7ab364c1 (patch)
treed49c575bd7be93b2522293e5d54a7ce743b08355 /scripts/bootstrap.ps1
parent61c055a6fcfee2a7e764997bb2478adf49db6edf (diff)
downloadvcpkg-40c8aab459f6692f68daa0ef431b80ca7ab364c1.tar.gz
vcpkg-40c8aab459f6692f68daa0ef431b80ca7ab364c1.zip
[vcpkg] Fix vs2015 build (#12789)
* move windows bootstrap directory * fix paths * actually fix the build * fix path
Diffstat (limited to 'scripts/bootstrap.ps1')
-rw-r--r--scripts/bootstrap.ps112
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index c062e58da..0d87d6ee8 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -57,11 +57,11 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
}
Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
-$vcpkgSourcesPath = "$vcpkgRootDir\toolsrc"
+$vcpkgBootstrapPath = "$vcpkgRootDir\toolsrc\windows-bootstrap"
-if (!(Test-Path $vcpkgSourcesPath))
+if (-not (Test-Path $vcpkgBootstrapPath))
{
- Write-Error "Unable to determine vcpkg sources directory. '$vcpkgSourcesPath' does not exist."
+ Write-Error "Unable to determine vcpkg build directory. '$vcpkgBootstrapPath' does not exist."
throw
}
@@ -339,7 +339,7 @@ if ($disableMetrics)
}
$platform = "x86"
-$vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x86.release"
+$vcpkgReleaseDir = "$vcpkgBootstrapPath\msbuild.x86.release"
if($PSVersionTable.PSVersion.Major -le 2)
{
$architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture
@@ -356,7 +356,7 @@ if ($win64)
}
$platform = "x64"
- $vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x64.release"
+ $vcpkgReleaseDir = "$vcpkgBootstrapPath\msbuild.x64.release"
}
if ($architecture -like "*64*")
@@ -379,7 +379,7 @@ $arguments = (
"/verbosity:minimal",
"/m",
"/nologo",
-"`"$vcpkgSourcesPath\dirs.proj`"") -join " "
+"`"$vcpkgBootstrapPath\dirs.proj`"") -join " "
function vcpkgInvokeCommandClean()
{