]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
Merge branch 'gcc_x' of git://github.com/sheepmaster/ccache
authorJoel Rosdahl <joel@rosdahl.net>
Tue, 1 Jun 2010 18:28:00 +0000 (20:28 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Tue, 1 Jun 2010 18:28:00 +0000 (20:28 +0200)
* 'gcc_x' of git://github.com/sheepmaster/ccache:
  Don't crash when an unknown language is specified with -x.
  Change languages for preprocessed objective-c(++) output.
  Add test for -x compiler option.
  Correct language for preprocessed c (there's a typo in the gcc manpage).
  Clean up comments a bit.
  Add support for the -x GCC switch (Based on http://www.mail-archive.com/ccache@lists.samba.org/msg00399.html)

1  2 
test.sh

diff --cc test.sh
Simple merge