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

config: Use extra_files_to_hash from conf struct
---

diff --git a/ccache.c b/ccache.c
index 4a66033c4..307d307d0 100644
--- a/ccache.c
+++ b/ccache.c
@@ -856,7 +856,6 @@ static void
 calculate_common_hash(struct args *args, struct mdfour *hash)
 {
 	struct stat st;
-	char *p;
 
 	hash_string(hash, HASH_PREFIX);
 
@@ -909,10 +908,9 @@ calculate_common_hash(struct args *args, struct mdfour *hash)
 		}
 	}
 
-	p = getenv("CCACHE_EXTRAFILES");
-	if (p) {
-		char *path, *q, *saveptr = NULL;
-		p = x_strdup(p);
+	if (!str_eq(conf->extra_files_to_hash, "")) {
+		char *path, *p, *q, *saveptr = NULL;
+		p = x_strdup(conf->extra_files_to_hash);
 		q = p;
 		while ((path = strtok_r(q, PATH_DELIM, &saveptr))) {
 			cc_log("Hashing extra file %s", path);