diff options
| author | Joel Rosdahl <joel@rosdahl.net> | 2018-09-26 22:34:50 +0200 |
|---|---|---|
| committer | Joel Rosdahl <joel@rosdahl.net> | 2018-09-26 22:34:50 +0200 |
| commit | f7712082106bef085515f86ae47e7dbbd2a48b57 (patch) | |
| tree | 5a726e74b5028d7d633300e3ae455561885b2970 /src/compopt.c | |
| parent | 2d57113eaa407bb92de51a3eb41cdd8cca820e3a (diff) | |
| parent | 554195a802cd4bdcc8d7698b0bbaccbf84f33939 (diff) | |
| download | ccache-dev/memcached.tar.gz | |
Merge branch 'master' into dev/memcacheddev/memcached
* master: (27 commits)
Update NEWS
Improve documentation of file_stat_matches_ctime
Add option to disable ctime check for manifest
test: Fix various Solaris shell issues
Prepare for v3.4.3
Update NEWS
Upgrade zlib to 1.2.11
Update NEWS
Bail out on compiler option -save-temps=obj
Fix minor memory leak introduced in dde3543c
Fix “clang analyze” false positive
Update NEWS
process_preprocessed_file: Move gnu_getcwd() out of tight loop
Make sure to install gperf for analyze
Update NEWS
Add handling of separate -target parameter
Update NEWS
Add a Vagrantfile for testing on FreeBSD
Compiler "cc" might still be the same as "clang"
Add FreeBSD compatibility to test suites
...
Diffstat (limited to 'src/compopt.c')
| -rw-r--r-- | src/compopt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/compopt.c b/src/compopt.c index aab9fe55..63351acb 100644 --- a/src/compopt.c +++ b/src/compopt.c @@ -35,6 +35,8 @@ static const struct compopt compopts[] = { {"--output-directory", AFFECTS_CPP | TAKES_ARG}, // nvcc {"--param", TAKES_ARG}, {"--save-temps", TOO_HARD}, + {"--save-temps=cwd",TOO_HARD}, + {"--save-temps=obj",TOO_HARD}, {"--serialize-diagnostics", TAKES_ARG | TAKES_PATH}, {"-A", TAKES_ARG}, {"-B", TAKES_ARG | TAKES_CONCAT_ARG | TAKES_PATH}, @@ -46,6 +48,7 @@ static const struct compopt compopts[] = { {"-L", TAKES_ARG}, {"-M", TOO_HARD}, {"-MF", TAKES_ARG}, + {"-MJ", TAKES_ARG | TOO_HARD}, {"-MM", TOO_HARD}, {"-MQ", TAKES_ARG}, {"-MT", TAKES_ARG}, @@ -85,6 +88,8 @@ static const struct compopt compopts[] = { {"-odir", AFFECTS_CPP | TAKES_ARG}, // nvcc {"-remap", AFFECTS_CPP}, {"-save-temps", TOO_HARD}, + {"-save-temps=cwd", TOO_HARD}, + {"-save-temps=obj", TOO_HARD}, {"-stdlib=", AFFECTS_CPP | TAKES_CONCAT_ARG}, {"-trigraphs", AFFECTS_CPP}, {"-u", TAKES_ARG | TAKES_CONCAT_ARG}, |