Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "21.1.0.rc1" %}
{% set version = "21.1.0.rc2" %}
{% set major_version = version.split(".")[0] %}
{% set tail_version = version.split(".")[-1] %}
{% set build_number = 0 %}
Expand All @@ -23,7 +23,7 @@ package:

source:
- url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz
sha256: 43c05ada2449f545d35a2530a44ef64a3de7e9dd54e6c53eaa7ffb419daa4f9e
sha256: f28b419ea38e554c295969c4d7fc3ea3b517d893b9f35e8e7aff50c507549459
patches:
- patches/0001-Find-conda-gcc-installation.patch
- patches/0002-Fix-sysroot-detection-for-linux.patch
Expand All @@ -35,8 +35,6 @@ source:
- patches/0008-Make-PIE-default-on-macOS-too.patch
- patches/0009-Find-ROCm-device-library-in-conda-layout.patch
- patches/0010-Add-conda-mingw-paths.patch
# backport https://github.com/llvm/llvm-project/pull/149570
- patches/0011-Revert-Move-python-binding-tests-to-lit-framework-14.patch
# name folder for easier deletion; we do the equivalent of downloading
# the subproject sources, so the work folder then has clang in it;
# for details see build scripts
Expand Down Expand Up @@ -474,17 +472,19 @@ outputs:
test:
requires:
- {{ compiler("cxx") }}
# - gxx_impl_{{ target_platform }} # [win64]
- gxx_impl_{{ target_platform }} # [win64]
files:
- mytest.cxx
commands:
# avoid CMake picking up random clang in image when using unactivated compilers
- del /s /q "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\x64\bin\clang++.exe" # [win]
- clang++ --version
- clang++-{{ major_version }} --version
- clang++ -v -c mytest.cxx
- unset CONDA_BUILD_SYSROOT # [unix]
- set "CONDA_BUILD_SYSROOT=" # [win]
- clang++ -v -c mytest.cxx
# - clang++ -v mytest.cxx --target=x86_64-w64-mingw32 # [win64]
- clang++ -v mytest.cxx --target=x86_64-w64-mingw32 # [win64]

- name: clang-format-{{ major_version }}
script: install_clang_format.sh # [unix]
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0001-Find-conda-gcc-installation.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 6247be9d8f71c64889c90573665a0ee6d81ac0e1 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Mon, 8 Apr 2019 16:20:03 -0500
Subject: [PATCH 01/11] Find conda gcc installation
Subject: [PATCH 01/10] Find conda gcc installation

---
clang/lib/Driver/ToolChains/Gnu.cpp | 7 ++++---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e72079b410cc152294b7c3a60921c926e5a8b03c Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Mon, 8 Apr 2019 16:32:17 -0500
Subject: [PATCH 02/11] Fix sysroot detection for linux
Subject: [PATCH 02/10] Fix sysroot detection for linux

---
clang/lib/Driver/ToolChains/Linux.cpp | 20 ++++++++++++++++----
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 95133a77b91df1861378b3b3f7a35f72c375ce92 Mon Sep 17 00:00:00 2001
From: Nehal J Wani <[email protected]>
Date: Sat, 25 Aug 2018 09:20:04 -0500
Subject: [PATCH 03/11] clang: add conda specific env var CONDA_BUILD_SYSROOT
Subject: [PATCH 03/10] clang: add conda specific env var CONDA_BUILD_SYSROOT

And also improve logic for finding the macos sysroot for conda

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d8ef2acfb9202d55a2ac4d5bd935b1e7ffbdcede Mon Sep 17 00:00:00 2001
From: Ray Donnelly <[email protected]>
Date: Wed, 30 Aug 2017 20:01:49 +0100
Subject: [PATCH 04/11] Fix normalizeProgramName()'s handling of dots outside
Subject: [PATCH 04/10] Fix normalizeProgramName()'s handling of dots outside
of .exe

It used to strip everything after the last dot, turning:
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0005-Set-VERSION-in-osx-as-well.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 4ee1ce6090103934f36a7bb58e682ae7a082462b Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Sat, 27 Jul 2019 11:55:23 -0500
Subject: [PATCH 05/11] Set VERSION in osx as well
Subject: [PATCH 05/10] Set VERSION in osx as well

---
clang/tools/libclang/CMakeLists.txt | 5 +++++
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0006-Fix-crosscompiling-LLVM-tools.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From bf8023147441d47b1823d7564d4f8e76c496acef Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Tue, 11 May 2021 15:08:13 +0200
Subject: [PATCH 06/11] Fix crosscompiling LLVM tools
Subject: [PATCH 06/10] Fix crosscompiling LLVM tools

---
clang/CMakeLists.txt | 10 ++++++++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e5d018a29b6347b08b21bad6e5d822b27b8dafc1 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <[email protected]>
Date: Thu, 14 Apr 2022 11:57:00 +1100
Subject: [PATCH 07/11] set libclang SOVERSION unconditionally
Subject: [PATCH 07/10] set libclang SOVERSION unconditionally

and avoid creating libclang with full version suffix
---
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0008-Make-PIE-default-on-macOS-too.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From abe02e77149a29dd326d063efb6f3aed5833150b Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Thu, 28 Dec 2023 19:32:19 +0530
Subject: [PATCH 08/11] Make PIE default on macOS too.
Subject: [PATCH 08/10] Make PIE default on macOS too.

This is the default for Linux from LLVM-15
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 33a528eefd88bca0a65db98d9bc4ec4c46cb8251 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Mon, 11 Mar 2024 14:03:12 -0500
Subject: [PATCH 09/11] Find ROCm device library in conda layout
Subject: [PATCH 09/10] Find ROCm device library in conda layout

---
clang/lib/Driver/ToolChains/AMDGPU.cpp | 19 +++++++++++++++++++
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0010-Add-conda-mingw-paths.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b676392475ce6fc7a91900377303fd6969dccb6a Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Fri, 18 Oct 2024 10:28:09 -0400
Subject: [PATCH 10/11] Add conda mingw paths
Subject: [PATCH 10/10] Add conda mingw paths

---
clang/lib/Driver/ToolChains/MinGW.cpp | 8 ++++++++
Expand Down
Loading