Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b6faa26
Merge remote-tracking branch 'upstream/main' into rc
h-vetinari Jul 18, 2023
0cd990b
Revert "remove rc-channel sources & targets"
h-vetinari Jul 18, 2023
0704ff5
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.24.0, and co…
h-vetinari Jul 19, 2023
3dcae7d
build from upstream main branch
h-vetinari Jul 19, 2023
c06df6b
fix jinja string concat and hard-coded version
h-vetinari Jul 19, 2023
8d205ff
rebase & fix patches
h-vetinari Jul 19, 2023
a1ba32e
fix compiler stack on osx vs. rc-label
h-vetinari Jul 19, 2023
2fed2ea
download archive of commit, instead of direct checkout
h-vetinari Jul 20, 2023
bc1242e
move skip to more obvious part of section
h-vetinari Jul 20, 2023
a7a9822
avoid redundant rename in install_clang_tools.sh
h-vetinari Jul 20, 2023
8703c7b
deal with library-extension for building from untagged commit
h-vetinari Jul 20, 2023
1ad4de1
Merge pull request #230 from h-vetinari/rc
h-vetinari Jul 21, 2023
5d13d3a
retrigger CI
h-vetinari Jul 21, 2023
6b634fa
Merge remote-tracking branch 'upstream/main' into rc
h-vetinari Jul 29, 2023
8613d72
clangdev 17.0.0.rc1
h-vetinari Jul 29, 2023
c018f30
MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and co…
h-vetinari Jul 29, 2023
546174a
clangdev 17.0.0.rc1 (#237)
github-actions[bot] Jul 30, 2023
f9aa16a
clarify SOVER_EXT definition in install_llvm.sh
h-vetinari Jul 30, 2023
9cdf0f2
clang-tools now links to libxml2
h-vetinari Jul 30, 2023
7448bc8
clangdev 17.0.0.rc2
h-vetinari Aug 9, 2023
946e156
set LLVM_ENABLE_LIBCXX=ON on osx
h-vetinari Aug 10, 2023
056e5b5
require MacOS 10.13
h-vetinari Aug 10, 2023
e330824
MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and co…
h-vetinari Aug 10, 2023
f4602f0
Merge pull request #238 from h-vetinari/rc
h-vetinari Aug 11, 2023
8b9c7dc
clangdev 17.0.0.rc3
h-vetinari Aug 23, 2023
178fbbf
handle rc suffix
h-vetinari Aug 23, 2023
a72d48b
clangdev 17.0.0.rc3 (#240)
github-actions[bot] Aug 23, 2023
277f2b3
Merge remote-tracking branch 'upstream/rc'
h-vetinari Sep 19, 2023
bec51e1
remove rc-channels
h-vetinari Sep 19, 2023
2794857
clangdev 17.0.0
h-vetinari Sep 19, 2023
82a41b8
Revert "fix compiler stack on osx vs. rc-label"
h-vetinari Sep 19, 2023
cbad9cb
MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.25.1, and co…
h-vetinari Sep 19, 2023
5d07ff2
clangdev 17.0.1
h-vetinari Sep 22, 2023
77ea915
Revert "require MacOS 10.13"
h-vetinari Sep 26, 2023
3e3f771
MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.2, and co…
h-vetinari Sep 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 8 additions & 45 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions .ci_support/migrations/libxml2211.yaml

This file was deleted.

9 changes: 4 additions & 5 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

115 changes: 115 additions & 0 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ rm -rf llvm-project
cd clang

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

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

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

if [[ "$target_platform" == osx* ]]; then
export CXXFLAGS="$CXXFLAGS -DTARGET_OS_OSX=1"
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_LIBCXX=ON"
fi

# disable -fno-plt due to some GCC bug causing linker errors, see
Expand Down
7 changes: 6 additions & 1 deletion recipe/install_clang_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,18 @@ rm -rf lib/lib*.a
MAJOR_VERSION=$(echo ${PKG_VERSION} | cut -f1 -d".")
for f in ${PREFIX}/bin/clang-*; do
if [[ "$(basename $f)" == clang-format-* ]]; then
# already got versioned in install_clang_format.sh
continue
elif [[ "$(basename $f)" == "clang-${MAJOR_VERSION}" ]]; then
# installation also creates a versioned clang, no need to re-version it
continue
fi
rm -f ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION}
mv $f ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION};
ln -s ${PREFIX}/bin/$(basename $f)-${MAJOR_VERSION} $f;
done

rm ${PREFIX}/bin/clang-${MAJOR_VERSION}-${MAJOR_VERSION}
# part of output "clang", not "clang-tools"
rm ${PREFIX}/bin/clang-${MAJOR_VERSION}
rm ${PREFIX}/bin/clang-cpp-${MAJOR_VERSION}
rm ${PREFIX}/bin/clang-cl-${MAJOR_VERSION}
Loading