diff --git a/clang/foo b/clang/foo new file mode 100644 diff --git a/libcxx/utils/ci/buildkite-pipeline-clang.yml b/libcxx/utils/ci/buildkite-pipeline-clang.yml --- a/libcxx/utils/ci/buildkite-pipeline-clang.yml +++ b/libcxx/utils/ci/buildkite-pipeline-clang.yml @@ -24,7 +24,8 @@ # but with the number of jobs we run daily, this can result in thousands of GB of network I/O. - "cmake -S llvm -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DLLVM_ENABLE_PROJECTS=\"clang;compiler-rt\"" - "ninja -C build install-clang install-clang-resource-headers" - - "buildkite-agent artifact upload --debug 'install/**/*'" + - "tar -czvf install.tar.gz install/" + - "buildkite-agent artifact upload --debug install.tar.gz" env: CC: "clang-${LLVM_HEAD_VERSION}" CXX: "clang++-${LLVM_HEAD_VERSION}" @@ -41,7 +42,8 @@ - label: "C++03" commands: - - "buildkite-agent artifact download 'install/**' ." + - "buildkite-agent artifact download install.tar.gz ." + - "tar -xzvf install.tar.gz" - "export CC=$(pwd)/install/bin/clang" - "export CXX=$(pwd)/install/bin/clang++" - "chmod +x install/bin/clang install/bin/clang++" @@ -63,7 +65,8 @@ - label: "C++2b" commands: - - "buildkite-agent artifact download 'install/**' ." + - "buildkite-agent artifact download install.tar.gz ." + - "tar -xzvf install.tar.gz" - "export CC=$(pwd)/install/bin/clang" - "export CXX=$(pwd)/install/bin/clang++" - "chmod +x install/bin/clang install/bin/clang++" @@ -85,7 +88,8 @@ - label: "Modules" commands: - - "buildkite-agent artifact download 'install/**' ." + - "buildkite-agent artifact download install.tar.gz ." + - "tar -xzvf install.tar.gz" - "export CC=$(pwd)/install/bin/clang" - "export CXX=$(pwd)/install/bin/clang++" - "chmod +x install/bin/clang install/bin/clang++" diff --git a/libcxx/utils/ci/generate-buildkite-pipeline b/libcxx/utils/ci/generate-buildkite-pipeline --- a/libcxx/utils/ci/generate-buildkite-pipeline +++ b/libcxx/utils/ci/generate-buildkite-pipeline @@ -19,7 +19,7 @@ CLANG_CHANGED=true fi -if [[ "${CLANG_CHANGED}" == "true" && "${LIBCXX_CHANGED}" != "true" ]]; then +if [[ "${CLANG_CHANGED}" == "true" ]]; then cat libcxx/utils/ci/buildkite-pipeline-clang.yml else cat libcxx/utils/ci/buildkite-pipeline.yml diff --git a/llvm/cmake/modules/LLVMInstallSymlink.cmake b/llvm/cmake/modules/LLVMInstallSymlink.cmake --- a/llvm/cmake/modules/LLVMInstallSymlink.cmake +++ b/llvm/cmake/modules/LLVMInstallSymlink.cmake @@ -17,7 +17,7 @@ endif() set(outdir "${DESTDIR}${outdir}") - message(STATUS "Creating ${name}") + message(STATUS "Creating ${name} with ${link_or_copy}") execute_process( COMMAND "${CMAKE_COMMAND}" -E ${link_or_copy} "${target}" "${name}"