From ae15b5da01bcd34a6faa98e9a6015e31038a4e3a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Tue, 28 Mar 2017 07:29:47 +0200 Subject: [PATCH] Enable the unifier option, also in direct mode --- MANUAL.txt | 4 +--- ccache.c | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/MANUAL.txt b/MANUAL.txt index a72922a7f..c45d7083e 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -543,8 +543,7 @@ NOTE: In previous versions of ccache, *CCACHE_TEMPDIR* had to be on the same unifier changes the hash, so cached compilations produced when the unifier is enabled cannot be reused when the unifier is disabled, and vice versa. Enabling the unifier may result in incorrect line number information in - compiler warning messages and expansions of the *\_\_LINE__* macro. Also - note that enabling the unifier implies turning off the direct mode. + compiler warning messages and expansions of the *\_\_LINE__* macro. Cache size management @@ -753,7 +752,6 @@ The direct mode will be disabled if any of the following holds: * the configuration setting *direct_mode* is false * a modification time of one of the include files is too new (needed to avoid a race condition) -* the unifier is enabled (the configuration setting *unify* is true) * a compiler option not supported by the direct mode is used: ** a *-Wp,_X_* compiler option other than *-Wp,-MD,_path_*, *-Wp,-MMD,_path_* and *-Wp,-D_define_* diff --git a/ccache.c b/ccache.c index 631eba6f7..462884471 100644 --- a/ccache.c +++ b/ccache.c @@ -3306,11 +3306,6 @@ ccache(int argc, char *argv[]) cc_log("Hostname: %s", get_hostname()); cc_log("Working directory: %s", get_current_working_dir()); - if (conf->unify) { - cc_log("Direct mode disabled because unify mode is enabled"); - conf->direct_mode = false; - } - conf->limit_multiple = MIN(MAX(conf->limit_multiple, 0.0), 1.0); // Arguments (except -E) to send to the preprocessor. -- 2.47.2