From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 8 Jan 2012 14:17:00 +0000 (+0100)
Subject: Merge branch 'master' into config
X-Git-Tag: v3.2~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9e8f5b2099092bb746a7ac0d635120bfb7cac86;p=thirdparty%2Fccache.git

Merge branch 'master' into config

* master:
  while (1) -> while (true)
  Fixup after merge: Make directory creation failure fatal
  Update NEWS
  Also recognize -specs=file in addition to --specs=file
  Revert GCC bug compatibility for -MTarg and -MQarg
  Fix minor memory leaks
  Correct log message when unify mode is enabled
  Hash environment variables that affect the preprocessor output
  Hash mtime or content of GCC plugins specified with -fplugin=
  Use hash_compiler for explicit --specs= options as well
  Refactor code into a hash_compiler function
  Improve description on how to fix bad object files in the cache
  Make failure to create files in cache fatal
  Make failure to create cache directories fatal
  Remove unused print_executed_command function
  Handle non-writable CCACHE_DIR gracefully

Conflicts:
	manifest.c
	test/framework.c
---

e9e8f5b2099092bb746a7ac0d635120bfb7cac86
diff --cc ccache.c
index ddc919b7c,3bf3ee575..7b93f5c2a
--- a/ccache.c
+++ b/ccache.c
@@@ -928,10 -951,12 +924,12 @@@ calculate_common_hash(struct args *args
  	 * behave differently depending on the real name.
  	 */
  	hash_delimiter(hash, "cc_name");
- 	hash_string(hash, basename(args->argv[0]));
+ 	p = basename(args->argv[0]);
+ 	hash_string(hash, p);
+ 	free(p);
  
  	/* Possibly hash the current working directory. */
 -	if (getenv("CCACHE_HASHDIR")) {
 +	if (conf->hash_dir) {
  		char *cwd = gnu_getcwd();
  		if (cwd) {
  			hash_delimiter(hash, "cwd");
diff --cc manifest.c
index 6d9c409aa,51e6682f9..ae6c2ff4a
--- a/manifest.c
+++ b/manifest.c
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * Copyright (C) 2009-2011 Joel Rosdahl
 - * Copyright (C) 2009-2010, 2012 Joel Rosdahl
++ * Copyright (C) 2009-2012 Joel Rosdahl
   *
   * This program is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License as published by the Free
diff --cc test/framework.c
index 425e9ff53,9abbb0585..fd6ce721d
--- a/test/framework.c
+++ b/test/framework.c
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * Copyright (C) 2010-2011 Joel Rosdahl
 - * Copyright (C) 2010, 2012 Joel Rosdahl
++ * Copyright (C) 2010-2012 Joel Rosdahl
   *
   * This program is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License as published by the Free