aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorYonggang Luo <luoyonggang@gmail.com>2023-10-10 00:51:13 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2023-10-17 15:20:46 +0200
commit4f94781196a5bea7c07f6a6d6c301abf2a069e2b (patch)
treefc5261b1c3696e316a91e6f42f2d6133f28bbaca /configure
parentc624cb32a92b84e7978e512e4d67c4e2b72b0e2b (diff)
downloadqemu-4f94781196a5bea7c07f6a6d6c301abf2a069e2b.zip
qemu-4f94781196a5bea7c07f6a6d6c301abf2a069e2b.tar.gz
qemu-4f94781196a5bea7c07f6a6d6c301abf2a069e2b.tar.bz2
Revert "configure: Add workaround for ccache and clang"
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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure32
1 files changed, 0 insertions, 32 deletions
diff --git a/configure b/configure
index 96d0dd5..d6103a0 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