Merge remote-tracking branch 'origin/main' into replace-swift-lang-with-swiftlang

Author: Mishal Shah

platforms/Linux/amazonlinux/2/swiftlang.spec

@@ -126,9 +126,6 @@ mv Yams-%{yams_version} yams
 # Adjust python version hwasan_symbolize
 %patch1 -p1
 
-# Fix python to python3
-ln -s /usr/bin/python3 /usr/bin/python
-
 %build
 export VERBOSE=1
 

platforms/Linux/centos/7/build_rpm.sh

@@ -32,6 +32,9 @@ cp patches/*.patch $HOME/rpmbuild/SOURCES/
 pushd $HOME/rpmbuild/SPECS
 # install all the dependencies needed to build Swift from the spec file itself
 yum-builddep -y ./swiftlang.spec
+# Workaround to support clang-3.5 or a later version
+echo -e ". /opt/rh/sclo-git25/enable\n. /opt/rh/llvm-toolset-7/enable\n. /opt/rh/devtoolset-8/enable\n" >> $HOME/.bashrc
+sed -i -e 's/\*__block/\*__libc_block/g' /usr/include/unistd.h
 # get the sources for Swift as defined in the spec file
 spectool -g -R ./swiftlang.spec
 # Now we proceed to build Swift. If this is successful, we

platforms/Linux/centos/7/swiftlang.spec

@@ -127,9 +127,6 @@ mv Yams-%{yams_version} yams
 # Adjust python version hwasan_symbolize
 %patch1 -p1
 
-# Fix python to python3
-ln -s /usr/bin/python3 /usr/bin/python
-
 %build
 export VERBOSE=1