From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 16 Jul 2011 15:14:29 +0000 (+0200)
Subject: config: Use disable from conf struct
X-Git-Tag: v3.2~226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44f3e8681cda85cde93e0b8e9f75e1175bbd8ef8;p=thirdparty%2Fccache.git

config: Use disable from conf struct
---

diff --git a/ccache.c b/ccache.c
index df5bf6370..4a66033c4 100644
--- a/ccache.c
+++ b/ccache.c
@@ -1954,17 +1954,17 @@ ccache(int argc, char *argv[])
 
 	initialize();
 
+	if (conf->disable) {
+		cc_log("ccache is disabled");
+		failed();
+	}
+
 	compile_preprocessed_source_code = !getenv("CCACHE_CPP2");
 
 	setup_uncached_err();
 
 	find_compiler(argc, argv);
 
-	if (getenv("CCACHE_DISABLE")) {
-		cc_log("ccache is disabled");
-		failed();
-	}
-
 	sloppiness = parse_sloppiness(getenv("CCACHE_SLOPPINESS"));
 
 	cc_log_argv("Command line: ", argv);