From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 5 Mar 2012 20:34:32 +0000 (+0100)
Subject: Fix leftovers of variable-based configuration
X-Git-Tag: v3.2~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ead34c2ce4bbfc58727bbfca8d5af27963d69619;p=thirdparty%2Fccache.git

Fix leftovers of variable-based configuration
---

diff --git a/ccache.c b/ccache.c
index f82f409f3..bb189a14f 100644
--- a/ccache.c
+++ b/ccache.c
@@ -413,7 +413,7 @@ ignore:
 
 /*
  * Make a relative path from current working directory to path if path is under
- * CCACHE_BASEDIR. Takes over ownership of path. Caller frees.
+ * the base directory. Takes over ownership of path. Caller frees.
  */
 static char *
 make_relative_path(char *path)
@@ -442,8 +442,8 @@ make_relative_path(char *path)
  * This function reads and hashes a file. While doing this, it also does these
  * things:
  *
- * - Makes include file paths whose prefix is CCACHE_BASEDIR relative when
- *   computing the hash sum.
+ * - Makes include file paths for which the base directory is a prefix relative
+ *   when computing the hash sum.
  * - Stores the paths and hashes of included files in the global variable
  *   included_files.
  */
@@ -695,7 +695,7 @@ to_cache(struct args *args)
 
 	if (output_to_real_object_first) {
 		int ret;
-		if (getenv("CCACHE_HARDLINK") && !conf->compression) {
+		if (conf->hard_link && !conf->compression) {
 			ret = link(tmp_obj, cached_obj);
 		} else {
 			ret = copy_file(tmp_obj, cached_obj, conf->compression);