Skip to content

Commit

Permalink
LLVM v19.1.4 (#150)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
conda-forge-admin authored Nov 20, 2024
2 parents 3543252 + 97580d7 commit 5ce57c1
Show file tree
Hide file tree
Showing 18 changed files with 78 additions and 80 deletions.
8 changes: 4 additions & 4 deletions .azure-pipelines/azure-pipelines-linux.yml

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

16 changes: 8 additions & 8 deletions .azure-pipelines/azure-pipelines-osx.yml

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

Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ uname_kernel_release:
uname_machine:
- x86_64
version:
- 19.1.3
- 19.1.4
zip_keys:
- - cross_target_platform
- macos_machine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ uname_kernel_release:
uname_machine:
- arm64
version:
- 19.1.3
- 19.1.4
zip_keys:
- - cross_target_platform
- macos_machine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ uname_kernel_release:
uname_machine:
- x86_64
version:
- 19.1.3
- 19.1.4
zip_keys:
- - cross_target_platform
- macos_machine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ uname_kernel_release:
uname_machine:
- arm64
version:
- 19.1.3
- 19.1.4
zip_keys:
- - cross_target_platform
- macos_machine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ uname_kernel_release:
uname_machine:
- x86_64
version:
- 19.1.3
- 19.1.4
zip_keys:
- - cross_target_platform
- macos_machine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ uname_kernel_release:
uname_machine:
- arm64
version:
- 19.1.3
- 19.1.4
zip_keys:
- - cross_target_platform
- macos_machine
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS

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

33 changes: 16 additions & 17 deletions README.md

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

2 changes: 1 addition & 1 deletion recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ MACOSX_DEPLOYMENT_TARGET: # [linux]
version:
- 17.0.6
- 18.1.8
- 19.1.3
- 19.1.4

# everything below is zipped
cross_target_platform:
Expand Down
6 changes: 0 additions & 6 deletions recipe/install-clang-scripts.sh

This file was deleted.

16 changes: 3 additions & 13 deletions recipe/install-clang.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
#!/bin/bash

set -e -x

CHOST=${macos_machine}

pushd "${PREFIX}"/bin
ln -s clang ${CHOST}-clang
ln -s clang-cpp ${CHOST}-clang-cpp
if [[ "${CBUILD}" != ${CHOST} ]] && [[ "${target_platform}" != linux-* || ( ${version} != "17.0.6" && ${version} != "18.1.8") ]]; then
# before v19.1.1, `clang` on linux already had this symlink, see
# https://github.com/conda-forge/clangdev-feedstock/pull/322
ln -s clang ${CBUILD}-clang
ln -s clang-cpp ${CBUILD}-clang-cpp
fi
popd
mkdir -p "${PREFIX}"/etc/conda/{de,}activate.d/
cp "${SRC_DIR}"/activate-clang.sh "${PREFIX}"/etc/conda/activate.d/activate_"${PKG_NAME}".sh
cp "${SRC_DIR}"/deactivate-clang.sh "${PREFIX}"/etc/conda/deactivate.d/deactivate_"${PKG_NAME}".sh
16 changes: 16 additions & 0 deletions recipe/install-clang_impl.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

set -e -x

CHOST=${macos_machine}

pushd "${PREFIX}"/bin
ln -s clang ${CHOST}-clang
ln -s clang-cpp ${CHOST}-clang-cpp
if [[ "${CBUILD}" != ${CHOST} ]] && [[ "${target_platform}" != linux-* || ( ${version} != "17.0.6" && ${version} != "18.1.8") ]]; then
# before v19.1.1, `clang` on linux already had this symlink, see
# https://github.com/conda-forge/clangdev-feedstock/pull/322
ln -s clang ${CBUILD}-clang
ln -s clang-cpp ${CBUILD}-clang-cpp
fi
popd
6 changes: 0 additions & 6 deletions recipe/install-clangxx-scripts.sh

This file was deleted.

15 changes: 3 additions & 12 deletions recipe/install-clangxx.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
#!/bin/bash

set -e -x

CHOST=${macos_machine}
echo CHOST is ${CHOST}

pushd "${PREFIX}"/bin
ln -s clang++ ${CHOST}-clang++
if [[ "${CBUILD}" != ${CHOST} ]] && [[ "${target_platform}" != linux-* || ( ${version} != "17.0.6" && ${version} != "18.1.8") ]]; then
# before v19.1.1, `clangxx` on linux already had this symlink, see
# https://github.com/conda-forge/clangdev-feedstock/pull/322
ln -s clang++ ${CBUILD}-clang++
fi
popd
mkdir -p "${PREFIX}"/etc/conda/{de,}activate.d/
cp "${SRC_DIR}"/activate-clang++.sh "${PREFIX}"/etc/conda/activate.d/activate_"${PKG_NAME}".sh
cp "${SRC_DIR}"/deactivate-clang++.sh "${PREFIX}"/etc/conda/deactivate.d/deactivate_"${PKG_NAME}".sh
15 changes: 15 additions & 0 deletions recipe/install-clangxx_impl.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

set -e -x

CHOST=${macos_machine}
echo CHOST is ${CHOST}

pushd "${PREFIX}"/bin
ln -s clang++ ${CHOST}-clang++
if [[ "${CBUILD}" != ${CHOST} ]] && [[ "${target_platform}" != linux-* || ( ${version} != "17.0.6" && ${version} != "18.1.8") ]]; then
# before v19.1.1, `clangxx` on linux already had this symlink, see
# https://github.com/conda-forge/clangdev-feedstock/pull/322
ln -s clang++ ${CBUILD}-clang++
fi
popd
11 changes: 5 additions & 6 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if version is not defined %}
{% set version = "19.1.3" %}
{% set version = "19.1.4" %}
{% endif %}
{% set major_ver = version.split(".")[0] %}
# in the past we've had to uncouple the compiler version from the version
Expand Down Expand Up @@ -31,7 +31,7 @@ requirements:

outputs:
- name: clang_impl_{{ cross_target_platform }}
script: install-clang.sh
script: install-clang_impl.sh
requirements:
- clang {{ version }}
- llvm-tools {{ version }}
Expand All @@ -58,7 +58,7 @@ outputs:
- {{ macos_machine }}-clang-cpp --version

- name: clang_{{ cross_target_platform }}
script: install-clang-scripts.sh
script: install-clang.sh
requirements:
run:
- {{ pin_subpackage("clang_impl_" ~ cross_target_platform, exact=True) }}
Expand All @@ -70,7 +70,7 @@ outputs:
- ${CPP_FOR_BUILD} --version

- name: clangxx_impl_{{ cross_target_platform }}
script: install-clangxx.sh
script: install-clangxx_impl.sh
requirements:
build:
- cctools_{{ target_platform }} # [osx]
Expand Down Expand Up @@ -99,7 +99,7 @@ outputs:
- {{ macos_machine }}-clang++ --version

- name: clangxx_{{ cross_target_platform }}
script: install-clangxx-scripts.sh
script: install-clangxx.sh
build:
# Since transitive run_exports are not currently possible
# (here I would like the run dependency on clangxx to pull in the run_exports from it).
Expand Down Expand Up @@ -164,6 +164,5 @@ about:
extra:
recipe-maintainers:
- isuruf
- mingwandroid
- katietz
- h-vetinari

0 comments on commit 5ce57c1

Please sign in to comment.