]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
config: Use extra_files_to_hash from conf struct
authorJoel Rosdahl <joel@rosdahl.net>
Sat, 16 Jul 2011 15:26:46 +0000 (17:26 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Wed, 20 Jul 2011 21:31:36 +0000 (23:31 +0200)
ccache.c

index 4a66033c4fe2dfa5bcb2bc8ff1d020247f643d2b..307d307d005ea314b5845c1308d8e0de65a19476 100644 (file)
--- 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);