Revert "Merge pull request #746 from davezarzycki/unbreak_non_darwin_unified_builds"
Revert "Merge pull request #746 from davezarzycki/unbreak_non_darwin_unified_builds"

This reverts commit 536ee580a7b2f24d27ef742b328db7a29cb87521, reversing
changes made to 10c2cf3b0a111a54698ae95887eb714ff165b503.

apple/swift-lldb,apple/swift-lldb,apple/swift-lldb,apple/swift-lldb,apple/swift-lldb,apple/swift-lldb