From 4e44517c9c4906bef61e6f37515fe3809b8dea30 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Mon, 21 Oct 2024 22:55:15 -0700 Subject: [PATCH] Move cosmo-clang to libexec The cosmo-clang command shouldn't be in the bin/ folder of cosmocc. It's intended as an implementation detail of `cosmocc -mclang`. Fixes #1317 --- tool/cosmocc/bin/cosmocc | 8 ++++---- tool/cosmocc/package.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tool/cosmocc/bin/cosmocc b/tool/cosmocc/bin/cosmocc index 3c27aa9527a..3019d062184 100755 --- a/tool/cosmocc/bin/cosmocc +++ b/tool/cosmocc/bin/cosmocc @@ -89,10 +89,10 @@ use_gcc() { use_clang() { CLANG=1 - CC_X86_64="$BIN/cosmo-clang" - CC_AARCH64="$BIN/cosmo-clang" - CXX_X86_64="$BIN/cosmo-clang" - CXX_AARCH64="$BIN/cosmo-clang" + CC_X86_64="$BIN/../libexec/clang" + CC_AARCH64="$BIN/../libexec/clang" + CXX_X86_64="$BIN/../libexec/clang" + CXX_AARCH64="$BIN/../libexec/clang" TARGET_X86_64="--target=x86_64" TARGET_AARCH64="--target=aarch64" FPORTCOSMO= diff --git a/tool/cosmocc/package.sh b/tool/cosmocc/package.sh index a63192a3bd9..55ae96cbff6 100755 --- a/tool/cosmocc/package.sh +++ b/tool/cosmocc/package.sh @@ -185,7 +185,7 @@ if [ ! -x bin/x86_64-linux-cosmo-gcc ]; then rm -f aarch64-gcc.zip rm -f x86_64-gcc.zip rm -f llvm.zip - mv bin/clang-19 bin/cosmo-clang + mv bin/clang-19 libexec/clang # use `cosmocc -mclang` instead fi rm -f bin/*-cpp rm -f bin/*-gcc-*