installer: add lld to installed image

compnerd · Jun 18, 2019 · db8881e · db8881e
1 parent 5e09000
commit db8881e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/.ci/azure-pipelines-aws-agent.yml b/.ci/azure-pipelines-aws-agent.yml
@@ -120,7 +120,7 @@ jobs:
       - task: MSBuild@1
         inputs:
           solution: $(Build.SourcesDirectory)\installer\windows-toolchain.wixproj
-          msbuildArguments: /p:RunWixToolsOutOfProc=true -p:INCLUDE_DEBUG_INFO=INCLUDE_DEBUG_INFO -p:LLVM_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:CLANG_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:LLDB_BUILD_DIR=$(Build.StagingDirectory)\lldb -p:SWIFT_BUILD_DIR=$(Build.StagingDirectory)\swift -p:SWIFT_SOURCE_DIR=$(Build.SourcesDirectory)\swift
+          msbuildArguments: /p:RunWixToolsOutOfProc=true -p:INCLUDE_DEBUG_INFO=INCLUDE_DEBUG_INFO -p:LLVM_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:CLANG_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:LLD_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:LLDB_BUILD_DIR=$(Build.StagingDirectory)\lldb -p:SWIFT_BUILD_DIR=$(Build.StagingDirectory)\swift -p:SWIFT_SOURCE_DIR=$(Build.SourcesDirectory)\swift
         displayName: "Build windows-toolchain-amd64.msi"
       - task: PublishBuildArtifacts@1
         inputs:

diff --git a/.ci/toolchain-vs2019-amd64.yml b/.ci/toolchain-vs2019-amd64.yml
@@ -118,7 +118,7 @@ jobs:
       - task: MSBuild@1
         inputs:
           solution: $(Build.SourcesDirectory)\installer\windows-toolchain.wixproj
-          msbuildArguments: /p:RunWixToolsOutOfProc=true -p:LLVM_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:CLANG_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:LLDB_BUILD_DIR=$(Build.StagingDirectory)\lldb -p:SWIFT_BUILD_DIR=$(Build.StagingDirectory)\swift -p:SWIFT_SOURCE_DIR=$(Build.SourcesDirectory)\swift
+          msbuildArguments: /p:RunWixToolsOutOfProc=true -p:LLVM_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:CLANG_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:LLD_BUILD_DIR=$(Build.StagingDirectory)\lld -p:LLDB_BUILD_DIR=$(Build.StagingDirectory)\lldb -p:SWIFT_BUILD_DIR=$(Build.StagingDirectory)\swift -p:SWIFT_SOURCE_DIR=$(Build.SourcesDirectory)\swift
         displayName: "Build windows-toolchain-amd64.msi"
         enabled: false
       - task: PublishBuildArtifacts@1

diff --git a/.ci/toolchain-vs2019-arm64.yml b/.ci/toolchain-vs2019-arm64.yml
@@ -137,7 +137,7 @@ jobs:
       - task: MSBuild@1
         inputs:
           solution: $(Build.SourcesDirectory)\installer\windows-toolchain.wixproj
-          msbuildArguments: /p:RunWixToolsOutOfProc=true -p:LLVM_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:CLANG_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:LLDB_BUILD_DIR=$(Build.StagingDirectory)\lldb -p:SWIFT_BUILD_DIR=$(Build.StagingDirectory)\swift -p:SWIFT_SOURCE_DIR=$(Build.SourcesDirectory)\swift
+          msbuildArguments: /p:RunWixToolsOutOfProc=true -p:LLVM_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:CLANG_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:LLD_BUILD_DIR=$(Build.StagingDirectory)\lld -p:LLDB_BUILD_DIR=$(Build.StagingDirectory)\lldb -p:SWIFT_BUILD_DIR=$(Build.StagingDirectory)\swift -p:SWIFT_SOURCE_DIR=$(Build.SourcesDirectory)\swift
         displayName: "Build windows-toolchain-amd64.msi"
         enabled: false
       - task: PublishBuildArtifacts@1

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -108,7 +108,7 @@ jobs:
       - task: MSBuild@1
         inputs:
           solution: $(Build.SourcesDirectory)\installer\windows-toolchain.wixproj
-          msbuildArguments: /p:RunWixToolsOutOfProc=true -p:LLVM_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:CLANG_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:LLDB_BUILD_DIR=$(Build.StagingDirectory)\lldb -p:SWIFT_BUILD_DIR=$(Build.StagingDirectory)\swift -p:SWIFT_SOURCE_DIR=$(Build.SourcesDirectory)\swift
+          msbuildArguments: /p:RunWixToolsOutOfProc=true -p:LLVM_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:CLANG_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:LLD_BUILD_DIR=$(Build.StagingDirectory)\llvm -p:LLDB_BUILD_DIR=$(Build.StagingDirectory)\lldb -p:SWIFT_BUILD_DIR=$(Build.StagingDirectory)\swift -p:SWIFT_SOURCE_DIR=$(Build.SourcesDirectory)\swift
         displayName: "Build windows-toolchain-amd64.msi"
       - task: PublishBuildArtifacts@1
         inputs:

diff --git a/installer/windows-toolchain.wixproj b/installer/windows-toolchain.wixproj
@@ -22,6 +22,7 @@
 
   <PropertyGroup>
     <CLANG_BUILD_DIR Condition=" '$(CLANG_BUILD_DIR)' == '' ">S:\b\llvm</CLANG_BUILD_DIR>
+    <LLD_BUILD_DIR Condition=" '$(LLD_BUILD_DIR)' == '' ">S:\b\llvm</LLD_BUILD_DIR>
     <LLDB_BUILD_DIR Condition=" '$(LLDB_BUILD_DIR)' == '' ">S:\b\lldb</LLDB_BUILD_DIR>
     <LLVM_BUILD_DIR Condition=" '$(LLVM_BUILD_DIR)' == '' ">S:\b\llvm</LLVM_BUILD_DIR>
     <SWIFT_BUILD_DIR Condition=" '$(SWIFT_BUILD_DIR)' == '' ">S:\b\swift</SWIFT_BUILD_DIR>

diff --git a/installer/windows-toolchain.wxs b/installer/windows-toolchain.wxs
@@ -14,6 +14,7 @@
     <Media Id="4" Cabinet="LLVM_PDBs.cab" EmbedCab="yes" />
     <Media Id="5" Cabinet="Swift_PDBs.cab" EmbedCab="yes" />
     <Media Id="6" Cabinet="SourceKit_PDBs.cab" EmbedCab="yes" />
+    <Media Id="7" Cabinet="LLD_PDBs.cab" EmbedCab="yes" />
 
     <!-- Directory Structure -->
     <Directory Id="TARGETDIR" Name="SourceDir">
@@ -85,6 +86,12 @@
         <File Id="SCAN_BUILD" Source="$(var.CLANG_BUILD_DIR)\bin\scan-build" Checksum="yes" />
         <File Id="SCAN_BUILD_BAT" Source="$(var.CLANG_BUILD_DIR)\bin\scan-build.bat" Checksum="yes" />
         <File Id="SCAN_VIEW" Source="$(var.CLANG_BUILD_DIR)\bin\scan-view" Checksum="yes" />
+        <!-- lld -->
+        <File Id="LLD_EXE" Source="$(var.LLD_BUILD_DIR)\bin\lld.exe" Checksum="yes" />
+        <File Id="LLD_LINK_EXE" Source="$(var.LLD_BUILD_DIR)\bin\lld-link.exe" Checksum="yes" />
+        <File Id="LD_LLD_EXE" Source="$(var.LLD_BUILD_DIR)\bin\ld.lld.exe" Checksum="yes" />
+        <File Id="LD64_LLD_EXE" Source="$(var.LLD_BUILD_DIR)\bin\ld64.lld.exe" Checksum="yes" />
+        <File Id="WASM_LD_EXE" Source="$(var.LLD_BUILD_DIR)\bin\wasm-ld.exe" Checksum="yes" />
         <!-- lldb -->
         <File Id="LIBLLDB_DLL" Source="$(var.LLDB_BUILD_DIR)\bin\liblldb.dll" Checksum="yes" />
         <File Id="LLDB_ARGDUMPER_EXE" Source="$(var.LLDB_BUILD_DIR)\bin\lldb-argdumper.exe" Checksum="yes" />
@@ -138,6 +145,8 @@
         <File Id="LIBCLANG_PDB" Source="$(var.CLANG_BUILD_DIR)\bin\libclang.pdb" Checksum="yes" DiskId="2" />
         <File Id="LIBINDEXSTORE_PDB" Source="$(var.CLANG_BUILD_DIR)\bin\libIndexStore.pdb" Checksum="yes" DiskId="2" />
         <File Id="OPTREMARKS_PDB" Source="$(var.CLANG_BUILD_DIR)\bin\OptRemarks.pdb" Checksum="yes" DiskId="2" />
+        <!-- lld -->
+        <File Id="LLD_PDB" Source="$(var.LLD_BUILD_DIR)\bin\lld.pdb" Checksum="yes" DiskId="7" />
         <!-- lldb -->
         <File Id="LIBLLDB_PDB" Source="$(var.LLDB_BUILD_DIR)\bin\liblldb.pdb" Checksum="yes" DiskId="3" />
         <File Id="LLDB_ARGDUMPER_PDB" Source="$(var.LLDB_BUILD_DIR)\bin\lldb-argdumper.pdb" Checksum="yes" DiskId="3" />