From faf4ecda49184f0679156f7e8a8cadb796f5700d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 2 Aug 2024 10:59:23 +1100 Subject: [PATCH 1/2] update default flags with newer/better upstream options In particular, `-fms-runtime-lib=` is supported since https://github.com/llvm/llvm-project/commit/fda44bedd64dbcde1b54432d99ad2f0fca0ad204, and all other options are directly available in clang (and thus don't need to be forwarded with `-Xclang`), see https://releases.llvm.org/16.0.0/tools/clang/docs/ClangCommandLineReference.html --- recipe/activate-clang_win-64.bat | 4 ++-- recipe/activate-clang_win-64.sh | 5 ++--- recipe/meta.yaml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/recipe/activate-clang_win-64.bat b/recipe/activate-clang_win-64.bat index a3002e8..c0583a5 100644 --- a/recipe/activate-clang_win-64.bat +++ b/recipe/activate-clang_win-64.bat @@ -8,6 +8,6 @@ set "RANLIB=llvm-ranlib.exe" set "NM=llvm-nm.exe" set "LD=lld-link.exe" -set "CPPFLAGS_USED=-D_CRT_SECURE_NO_WARNINGS -D_MT -D_DLL -nostdlib -Xclang --dependent-lib=msvcrt -fuse-ld=lld -fno-aligned-allocation" -set "LDFLAGS=-nostdlib -Xclang --dependent-lib=msvcrt -fuse-ld=lld -Wl,-defaultlib:%CONDA_PREFIX:\=/%/lib/clang/@MAJOR_VER@/lib/windows/clang_rt.builtins-x86_64.lib" +set "CPPFLAGS_USED=-D_CRT_SECURE_NO_WARNINGS -nostdlib -fms-runtime-lib=dll -fuse-ld=lld -fno-aligned-allocation" +set "LDFLAGS=-nostdlib -Wl,-defaultlib:%CONDA_PREFIX:\=/%/lib/clang/@MAJOR_VER@/lib/windows/clang_rt.builtins-x86_64.lib" set "CFLAGS=@CFLAGS@ %CPPFLAGS_USED%" diff --git a/recipe/activate-clang_win-64.sh b/recipe/activate-clang_win-64.sh index b5e0163..21354a6 100644 --- a/recipe/activate-clang_win-64.sh +++ b/recipe/activate-clang_win-64.sh @@ -108,13 +108,12 @@ MSVC_INCLUDE=${CONDA_BUILD_WINSDK}/msvc-@MSVC_HEADERS_VERSION@/include MSVC_LIB=${CONDA_BUILD_WINSDK}/msvc-@MSVC_HEADERS_VERSION@/lib INCLUDE_USED="${INCLUDE_USED};${MSVC_INCLUDE};${WINSDK_INCLUDE}/ucrt;${WINSDK_INCLUDE}/shared;${WINSDK_INCLUDE}/um;${WINSDK_INCLUDE}/winrt" LIB_USED="${LIB_USED};${WINSDK_LIB}/ucrt/x64;${WINSDK_LIB}/um/x64;${MSVC_LIB}/x64" -CPPFLAGS_USED="-D_CRT_SECURE_NO_WARNINGS -D_MT -D_DLL --target=@CHOST@ -nostdlib -Xclang --dependent-lib=msvcrt -fuse-ld=lld -fno-aligned-allocation" +CPPFLAGS_USED="-D_CRT_SECURE_NO_WARNINGS --target=@CHOST@ -nostdlib -fms-runtime-lib=dll -fuse-ld=lld -fno-aligned-allocation" # Only include overlay if there is one. We don't need it on case-insensitive file systems. if [ -f "${CONDA_BUILD_WINSDK}/winsdk-@WINSDK_VERSION@/winsdk_vfs_overlay.yaml" ]; then CPPFLAGS_USED="${CPPFLAGS_USED} -Xclang -ivfsoverlay -Xclang ${CONDA_BUILD_WINSDK}/winsdk-@WINSDK_VERSION@/winsdk_vfs_overlay.yaml" fi -LDFLAGS_USED="--target=@CHOST@ -nostdlib -Xclang --dependent-lib=msvcrt -fuse-ld=lld" -LDFLAGS_USED="${LDFLAGS_USED} -Wl,-defaultlib:@PREFIX@/lib/clang/@MAJOR_VER@/lib/windows/clang_rt.builtins-x86_64.lib" +LDFLAGS_USED="--target=@CHOST@ -nostdlib -Wl,-defaultlib:@PREFIX@/lib/clang/@MAJOR_VER@/lib/windows/clang_rt.builtins-x86_64.lib" _tc_activation \ activate host @CHOST@ @CHOST@- \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c259e06..af8e83d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,7 +7,7 @@ {% set cl_minor = CL_VERSION.split(".")[1] %} {% set vc_major = VCVER.split(".")[0] %} -{% set build_number = 12 %} +{% set build_number = 13 %} # separate builds number for headers & winsdk; reset when version increases (resp. all relevant versions) {% set headers_build_number = 4 %} From a7e968c91c3f362fa869eff7a86836a0223319d2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 2 Aug 2024 11:05:25 +1100 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.37.2, and conda-forge-pinning 2024.08.01.21.00.38 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- ...ADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml | 2 +- ...ADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml | 2 +- ...ADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml | 2 +- ...ADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml | 2 +- ...ADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml | 2 +- ...ADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml | 2 +- .scripts/build_steps.sh | 1 - .scripts/run_osx_build.sh | 2 +- build-locally.py | 4 ++-- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index ef87740..156592a 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -39,7 +39,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_CLANG_VERSION16.0.6CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml b/.ci_support/linux_64_CLANG_VERSION16.0.6CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml index f3bb7d2..a179b2f 100644 --- a/.ci_support/linux_64_CLANG_VERSION16.0.6CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml +++ b/.ci_support/linux_64_CLANG_VERSION16.0.6CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml @@ -23,7 +23,7 @@ WINSDK_URL: WINSDK_VERSION: - 10.0.22621.0 cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_CLANG_VERSION16.0.6CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml b/.ci_support/linux_64_CLANG_VERSION16.0.6CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml index 94851a6..4f7aa10 100644 --- a/.ci_support/linux_64_CLANG_VERSION16.0.6CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml +++ b/.ci_support/linux_64_CLANG_VERSION16.0.6CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml @@ -23,7 +23,7 @@ WINSDK_URL: WINSDK_VERSION: - 10.0.22621.0 cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_CLANG_VERSION17.0.6CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml b/.ci_support/linux_64_CLANG_VERSION17.0.6CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml index 20a661b..7a1638f 100644 --- a/.ci_support/linux_64_CLANG_VERSION17.0.6CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml +++ b/.ci_support/linux_64_CLANG_VERSION17.0.6CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml @@ -23,7 +23,7 @@ WINSDK_URL: WINSDK_VERSION: - 10.0.22621.0 cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_CLANG_VERSION17.0.6CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml b/.ci_support/linux_64_CLANG_VERSION17.0.6CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml index 13b79f9..fd5bb42 100644 --- a/.ci_support/linux_64_CLANG_VERSION17.0.6CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml +++ b/.ci_support/linux_64_CLANG_VERSION17.0.6CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml @@ -23,7 +23,7 @@ WINSDK_URL: WINSDK_VERSION: - 10.0.22621.0 cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_CLANG_VERSION18.1.8CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml b/.ci_support/linux_64_CLANG_VERSION18.1.8CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml index 676911c..4d020e3 100644 --- a/.ci_support/linux_64_CLANG_VERSION18.1.8CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml +++ b/.ci_support/linux_64_CLANG_VERSION18.1.8CL_VERSION19.29.30139MSVC_HEADERS_VERSION14.29.30133TOOLCHAIN_COMBINED14.29.16.11.yaml @@ -23,7 +23,7 @@ WINSDK_URL: WINSDK_VERSION: - 10.0.22621.0 cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_CLANG_VERSION18.1.8CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml b/.ci_support/linux_64_CLANG_VERSION18.1.8CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml index 3529b92..7129318 100644 --- a/.ci_support/linux_64_CLANG_VERSION18.1.8CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml +++ b/.ci_support/linux_64_CLANG_VERSION18.1.8CL_VERSION19.40.33808MSVC_HEADERS_VERSION14.40.33807TOOLCHAIN_COMBINED14.40.17.10.yaml @@ -23,7 +23,7 @@ WINSDK_URL: WINSDK_VERSION: - 10.0.22621.0 cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,6 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index ba0c879..420f051 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns):