Skip to content

Commit eeaec38

Browse files
authored
Merge pull request #241 from h-vetinari/17
clangdev 17.0.1
2 parents ee8c8f9 + 3e3f771 commit eeaec38

18 files changed

+193
-113
lines changed

.azure-pipelines/azure-pipelines-linux.yml

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.azure-pipelines/azure-pipelines-win.yml

Lines changed: 8 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.ci_support/migrations/libxml2211.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.scripts/build_steps.sh

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/logging_utils.sh

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/run_osx_build.sh

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.scripts/run_win_build.bat

Lines changed: 115 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

recipe/build.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@ rm -rf llvm-project
1515
cd clang
1616

1717
IFS='.' read -r -a PKG_VER_ARRAY <<< "${PKG_VERSION}"
18+
# default SOVER for tagged releases is just the major version
19+
SOVER_EXT=${VER_ARR[0]}
20+
if [[ "${PKG_VERSION}" == *dev0 ]]; then
21+
# otherwise with git suffix
22+
SOVER_EXT="${SOVER_EXT}git"
23+
fi
1824

19-
sed -i.bak "s/libLTO.dylib/libLTO.${PKG_VER_ARRAY[0]}.dylib/g" lib/Driver/ToolChains/Darwin.cpp
25+
sed -i.bak "s/libLTO.dylib/libLTO.${SOVER_EXT}.dylib/g" lib/Driver/ToolChains/Darwin.cpp
2026

2127
if [[ "$variant" == "hcc" ]]; then
2228
CMAKE_ARGS="$CMAKE_ARGS -DKALMAR_BACKEND=HCC_BACKEND_AMDGPU -DHCC_VERSION_STRING=2.7-19365-24e69cd8-24e69cd8-24e69cd8"
@@ -36,6 +42,7 @@ fi
3642

3743
if [[ "$target_platform" == osx* ]]; then
3844
export CXXFLAGS="$CXXFLAGS -DTARGET_OS_OSX=1"
45+
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_LIBCXX=ON"
3946
fi
4047

4148
# disable -fno-plt due to some GCC bug causing linker errors, see

recipe/install_clang_tools.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,18 @@ rm -rf lib/lib*.a
1515
MAJOR_VERSION=$(echo ${PKG_VERSION} | cut -f1 -d".")
1616
for f in ${PREFIX}/bin/clang-*; do
1717
if [[ "$(basename $f)" == clang-format-* ]]; then
18+
# already got versioned in install_clang_format.sh
19+
continue
20+
elif [[ "$(basename $f)" == "clang-${MAJOR_VERSION}" ]]; then
21+
# installation also creates a versioned clang, no need to re-version it
1822
continue
1923
fi
2024
rm -f ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION}
2125
mv $f ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION};
2226
ln -s ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION} $f;
2327
done
2428

25-
rm ${PREFIX}/bin/clang-${MAJOR_VERSION}-${MAJOR_VERSION}
29+
# part of output "clang", not "clang-tools"
30+
rm ${PREFIX}/bin/clang-${MAJOR_VERSION}
2631
rm ${PREFIX}/bin/clang-cpp-${MAJOR_VERSION}
2732
rm ${PREFIX}/bin/clang-cl-${MAJOR_VERSION}

0 commit comments

Comments
 (0)