[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/32] Revert "configure: Add workaround for ccache and clang"
|
From: |
Paolo Bonzini |
|
Subject: |
[PULL 03/32] Revert "configure: Add workaround for ccache and clang" |
|
Date: |
Wed, 18 Oct 2023 10:27:23 +0200 |
From: Yonggang Luo <luoyonggang@gmail.com>
This reverts commit fd0e60530f10078f488fa3e9591cc7db5732989c.
According to
https://peter.eisentraut.org/blog/2014/12/01/ccache-and-clang-part-3
it's already fixed in new version of ccache
According to https://ccache.dev/manual/4.8.html#config_run_second_cpp
CCACHE_CPP2 are default to true for new version ccache
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-ID: <20231009165113.498-1-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 32 --------------------------------
1 file changed, 32 deletions(-)
diff --git a/configure b/configure
index 96d0dd5ffc9..d6103a0141f 100755
--- a/configure
+++ b/configure
@@ -1166,34 +1166,6 @@ EOF
fi
fi
-########################################
-# check if ccache is interfering with
-# semantic analysis of macros
-
-unset CCACHE_CPP2
-ccache_cpp2=no
-cat > $TMPC << EOF
-static const int Z = 1;
-#define fn() ({ Z; })
-#define TAUT(X) ((X) == Z)
-#define PAREN(X, Y) (X == Y)
-#define ID(X) (X)
-int main(void)
-{
- int x = 0, y = 0;
- x = ID(x);
- x = fn();
- fn();
- if (PAREN(x, y)) return 0;
- if (TAUT(Z)) return 0;
- return 0;
-}
-EOF
-
-if ! compile_object "-Werror"; then
- ccache_cpp2=yes
-fi
-
##########################################
# functions to probe cross compilers
@@ -1726,10 +1698,6 @@ if test "$default_targets" = "yes"; then
echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
fi
-if test "$ccache_cpp2" = "yes"; then
- echo "export CCACHE_CPP2=y" >> $config_host_mak
-fi
-
# contrib/plugins configuration
echo "# Automatically generated by configure - do not modify" >
contrib/plugins/$config_host_mak
echo "SRC_PATH=$source_path/contrib/plugins" >>
contrib/plugins/$config_host_mak
--
2.41.0
- [PULL 00/32] x86 and build system changes for 2023-10-18, Paolo Bonzini, 2023/10/18
- [PULL 01/32] iotests: get rid of '..' in path environment output, Paolo Bonzini, 2023/10/18
- [PULL 03/32] Revert "configure: Add workaround for ccache and clang",
Paolo Bonzini <=
- [PULL 05/32] target/i386: check intercept for XSETBV, Paolo Bonzini, 2023/10/18
- [PULL 06/32] tests/vm: netbsd: install dtc, Paolo Bonzini, 2023/10/18
- [PULL 02/32] iotests: use the correct python to run linters, Paolo Bonzini, 2023/10/18
- [PULL 07/32] scripts: Mark feature_to_c.py as non-executable to fix a build issue, Paolo Bonzini, 2023/10/18
- [PULL 08/32] scripts/get_maintainer.pl: don't print parentheses, Paolo Bonzini, 2023/10/18
- [PULL 09/32] tests/docker: avoid invalid escape in Python string, Paolo Bonzini, 2023/10/18
- [PULL 04/32] target/i386/cpu: Fix CPUID_HT exposure, Paolo Bonzini, 2023/10/18
- [PULL 10/32] docs/sphinx: avoid invalid escape in Python string, Paolo Bonzini, 2023/10/18
- [PULL 11/32] target/hexagon: avoid invalid escape in Python string, Paolo Bonzini, 2023/10/18
- [PULL 12/32] tests/avocado: avoid invalid escape in Python string, Paolo Bonzini, 2023/10/18