PageRenderTime 41ms CodeModel.GetById 15ms RepoModel.GetById 1ms app.codeStats 0ms

/trunk/CCache/debian/patches/06_md.diff

#
Unknown | 77 lines | 73 code | 4 blank | 0 comment | 0 complexity | 931e3f89290ddb668d787db3a9e985c4 MD5 | raw file
Possible License(s): LGPL-2.1, Cube, GPL-3.0, 0BSD, GPL-2.0 
    

  1. --- ccache.c	Mon Sep 13 11:38:30 2004
    2. 

  2. +++ ccache.c	Thu Jun 21 22:17:32 2007
    3. 

  3. @@ -627,6 +627,13 @@ static void process_args(int argc, char 
    4. 

  4.  	int found_S_opt = 0;
    5. 

  5.  	struct stat st;
    6. 

  6.  	char *e;
    7. 

  7. +	/* is gcc being asked to output dependencies? */
    8. 

  8. +	int generating_dependencies = 0;
    9. 

  9. +	/* is the dependency makefile name overridden with -MF? */
    10. 

  10. +	int dependency_filename_specified = 0;
    11. 

  11. +	/* is the dependency makefile target name specified with -MQ or -MF? */
    12. 

  12. +	int dependency_target_specified = 0;
    13. 

  13. +
    14. 

  14.  
    15. 

  15.  	stripped_args = args_init(0, NULL);
    16. 

  16.  
    17. 

  17. @@ -702,6 +709,18 @@ static void process_args(int argc, char 
    18. 

  18.  			continue;
    19. 

  19.  		}
    20. 

  20.  
    21. 

  21. +		/* These options require special handling, because they
    22. 

  22. +		   behave differently with gcc -E, when the output
    23. 

  23. +		   file is not specified. */
    24. 

  24. +
    25. 

  25. +		if (strcmp(argv[i], "-MD") == 0 || strcmp(argv[i], "-MMD") == 0) {
    26. 

  26. +			generating_dependencies = 1;
    27. 

  27. +		} else if (strcmp(argv[i], "-MF") == 0) {
    28. 

  28. +			dependency_filename_specified = 1;
    29. 

  29. +		} else if (strcmp(argv[i], "-MQ") == 0 || strcmp(argv[i], "-MT") == 0) {
    30. 

  30. +			dependency_target_specified = 1;
    31. 

  31. +		}
    32. 

  32. +
    33. 

  33.  		/* options that take an argument */
    34. 

  34.  		{
    35. 

  35.  			const char *opts[] = {"-I", "-include", "-imacros", "-iprefix",
    36. 

  36. @@ -812,6 +831,41 @@ static void process_args(int argc, char 
    37. 

  37.  		}
    38. 

  38.  		p[1] = found_S_opt ? 's' : 'o';
    39. 

  39.  		p[2] = 0;
    40. 

  40. +	}
    41. 

  41. +
    42. 

  42. +	/* If dependencies are generated, configure the preprocessor */
    43. 

  43. +
    44. 

  44. +	if (generating_dependencies && output_file) {
    45. 

  45. +		if (!dependency_filename_specified) {
    46. 

  46. +			char *default_depfile_name = x_strdup(output_file);
    47. 

  47. +			char *p = strrchr(default_depfile_name, '.');
    48. 

  48. +
    49. 

  49. +			if (p) {
    50. 

  50. +				if (strlen(p) < 2) {
    51. 

  51. +					stats_update(STATS_ARGS);
    52. 

  52. +					failed();
    53. 

  53. +					return;
    54. 

  54. +				}
    55. 

  55. +				*p = 0;
    56. 

  56. +			}
    57. 

  57. +			else  {
    58. 

  58. +				int len = p - default_depfile_name;
    59. 

  59. +				
    60. 

  60. +				p = x_malloc(len + 3);
    61. 

  61. +				strncpy(default_depfile_name, p, len - 1);
    62. 

  62. +				free(default_depfile_name);
    63. 

  63. +				default_depfile_name = p;
    64. 

  64. +			}
    65. 

  65. +
    66. 

  66. +			strcat(default_depfile_name, ".d");
    67. 

  67. +			args_add(stripped_args, "-MF");
    68. 

  68. +			args_add(stripped_args, default_depfile_name);
    69. 

  69. +		}
    70. 

  70. +
    71. 

  71. +		if (!dependency_target_specified) {
    72. 

  72. +			args_add(stripped_args, "-MT");
    73. 

  73. +			args_add(stripped_args, output_file);
    74. 

  74. +		}
    75. 

  75.  	}
    76. 

  76.  
    77. 

  77.  	/* cope with -o /dev/null */
    78. 

  78.