Skip to content

Commit

Permalink
Merge pull request #133 from h-vetinari/pp
Browse files Browse the repository at this point in the history
add symlinks for $TRIPLE-clang-cpp
  • Loading branch information
h-vetinari authored Jul 20, 2024
2 parents b5df73f + 83017bd commit 8339a66
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 2 additions & 0 deletions recipe/install-clang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ CHOST=${macos_machine}

pushd "${PREFIX}"/bin
ln -s clang ${CHOST}-clang
ln -s clang-cpp ${CHOST}-clang-cpp
if [[ "${CBUILD}" != ${CHOST} ]] && [[ "${target_platform}" != linux-* ]]; then
# on linux, the `clang` package already has a $TRIPLE-clang, see
# https://github.com/conda-forge/clangdev-feedstock/pull/251
ln -s clang ${CBUILD}-clang
ln -s clang-cpp ${CBUILD}-clang-cpp
fi
popd
7 changes: 6 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{% set libcxx_major = 16 %}
{% endif %}

{% set build_number = 17 %}
{% set build_number = 18 %}

# pretend this variable is used, so that smithy populates the variant configs
# [meson_release_flag]
Expand Down Expand Up @@ -59,7 +59,9 @@ outputs:
test:
commands:
- {{ CBUILD }}-clang --version
- {{ CBUILD }}-clang-cpp --version
- {{ macos_machine }}-clang --version
- {{ macos_machine }}-clang-cpp --version

- name: clang_{{ cross_target_platform }}
script: install-clang-scripts.sh
Expand All @@ -69,7 +71,9 @@ outputs:
test:
commands:
- {{ CBUILD }}-clang --version
- {{ CBUILD }}-clang-cpp --version
- {{ macos_machine }}-clang --version
- {{ macos_machine }}-clang-cpp --version

- name: clangxx_impl_{{ cross_target_platform }}
script: install-clangxx.sh
Expand Down Expand Up @@ -147,6 +151,7 @@ outputs:
test:
commands:
- {{ macos_machine }}-clang --version
- {{ macos_machine }}-clang-cpp --version
- {{ macos_machine }}-clang++ --version
about:
home: https://llvm.org
Expand Down

0 comments on commit 8339a66

Please sign in to comment.