diff --git a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
index 13bf3b7df..78e1536a2 100644
--- a/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
+++ b/build/package/Microsoft.DotNet.Cli.Installer.DEB.targets
@@ -3,6 +3,10 @@
     
     <UsingTask TaskName="DebTargets" AssemblyFile="$(CLIBuildDll)" />
 
+    <PropertyGroup>
+    	<CLISDKRoot>$(LayoutDirectory)/$(ArtifactNameSdk)/sdk</CLISDKRoot>
+    </PropertyGroup>
+
     <Target Name="GenerateDebs" >
         <DebTargets />
     </Target>
diff --git a/init-tools.ps1 b/init-tools.ps1
index 248e458d7..250505650 100644
--- a/init-tools.ps1
+++ b/init-tools.ps1
@@ -3,6 +3,11 @@
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.
 #
 
+param(
+    [string]$Architecture="x64")
+
+$RepoRoot = "$PSScriptRoot"
+
 # Load Branch Info
 cat "$RepoRoot\branchinfo.txt" | ForEach-Object {
     if(!$_.StartsWith("#") -and ![String]::IsNullOrWhiteSpace($_)) {
diff --git a/run-build.ps1 b/run-build.ps1
index 37071fde4..07a620c3c 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -34,7 +34,7 @@ else
     $env:DOTNET_BUILD_SKIP_PACKAGING=0
 }
 
-& "$RepoRoot\init-tools.ps1"
+& "$RepoRoot\init-tools.ps1" -Architecture $Architecture
 if($LASTEXITCODE -ne 0) { throw "Failed to install Init Tools" }
 
 dotnet build3 build.proj /p:Architecture=$Architecture
diff --git a/run-build.sh b/run-build.sh
index 8a4de9e58..d7e5cd3bf 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -55,22 +55,6 @@ while [[ $# > 0 ]]; do
     shift
 done
 
-# Set up the environment to be used for building with clang.
-if which "clang-3.5" > /dev/null 2>&1; then
-    export CC="$(which clang-3.5)"
-    export CXX="$(which clang++-3.5)"
-elif which "clang-3.6" > /dev/null 2>&1; then
-    export CC="$(which clang-3.6)"
-    export CXX="$(which clang++-3.6)"
-elif which clang > /dev/null 2>&1; then
-    export CC="$(which clang)"
-    export CXX="$(which clang++)"
-else
-    error "Unable to find Clang Compiler"
-    error "Install clang-3.5 or clang3.6"
-    exit 1
-fi
-
 # Load Branch Info
 while read line; do
     if [[ $line != \#* ]]; then