From 845c7ddf594ed1beccbca90fee045592629a8912 Mon Sep 17 00:00:00 2001
From: Roland Rossgotterer <roland.rossgotterer@gmail.com>
Date: Mon, 14 Jan 2019 15:08:51 +0100
Subject: [PATCH] Add swift_crashpad_handler to Linux installer

Summary:
swift_crashpad_handler for Linux was part of externals but was never copied to out/
and also never copied into the installer.

Reviewers: #gatekeepers

Differential Revision: https://dev.swift-project.org/D96
---
 installer/installbuilder/swift-externals.xml | 11 +++++++++++
 src/blackmisc/blackmisc.pro                  |  7 ++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/installer/installbuilder/swift-externals.xml b/installer/installbuilder/swift-externals.xml
index 16a7f55bc..0656d5480 100644
--- a/installer/installbuilder/swift-externals.xml
+++ b/installer/installbuilder/swift-externals.xml
@@ -42,6 +42,17 @@
                 </distributionFile>
             </distributionFileList>
         </folder>
+        <folder>
+            <description>bin</description>
+            <destination>${installdir}/bin</destination>
+            <name>bin_linux</name>
+            <platforms>linux linux-x64</platforms>
+            <distributionFileList>
+                <distributionFile>
+                    <origin>../../dist/bin/swift_crashpad_handler</origin>
+                </distributionFile>
+            </distributionFileList>
+        </folder>
         <folder>
             <description>bin</description>
             <destination>${installdir}/bin</destination>
diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro
index d3c2857e5..c75ec013e 100644
--- a/src/blackmisc/blackmisc.pro
+++ b/src/blackmisc/blackmisc.pro
@@ -118,11 +118,8 @@ else:unix {
     source_path = $$EXTERNALS_BIN_DIR/*
     dest_path = $$DestRoot/bin
 }
-# Currently there is no bin folder in linux externals
-win32|macx {
-    !isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += &&
-    QMAKE_POST_LINK += $$copy_command $$shell_path($$source_path) $$shell_path($$dest_path)
-}
+!isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += &&
+QMAKE_POST_LINK += $$copy_command $$shell_path($$source_path) $$shell_path($$dest_path)
 
 win32 {
     copy_command = xcopy /Y