Merge pull request #2037 from swiftwasm/katei/merge-main-2020-10-20

Merge main 2020-10-20

Author: MaxDesiatov

.github/workflows/main.yml

@@ -126,8 +126,10 @@ jobs:
             ${{ runner.os }}-sccache-v10-
       - name: Build macOS installable archive
         run: |
-          sudo xcode-select --switch /Applications/Xcode_12.app/Contents/Developer/
+          sudo xcode-select --switch /Applications/Xcode_12.2.0.app/Contents/Developer/
           ./utils/webassembly/ci.sh
+        env:
+          SKIP_XCODE_VERSION_CHECK: 1
       - name: Upload macOS installable archive
         uses: actions/upload-artifact@v1
         with:

cmake/modules/AddSwift.cmake

@@ -473,7 +473,7 @@ function(add_swift_host_library name)
       INSTALL_NAME_DIR "@rpath")
   elseif(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX)
     set_target_properties(${name} PROPERTIES
-      INSTALL_RPATH "$ORIGIN:/usr/lib/swift/linux")
+      INSTALL_RPATH "$ORIGIN")
   elseif(SWIFT_HOST_VARIANT_SDK STREQUAL CYGWIN)
     set_target_properties(${name} PROPERTIES
       INSTALL_RPATH "$ORIGIN:/usr/lib/swift/cygwin")

docs/CppInteroperabilityManifesto.md

@@ -3197,7 +3197,7 @@ UTF-8 data.
 class Employee {
 public:
   std::string DebugDescription() const;
-  [[swift::import_as_std_string]] std::string SeriaziledAsProtobuf() const;
+  [[swift::import_as_std_string]] std::string SerializedAsProtobuf() const;
 };
 ```