diff options
| author | Tommi Komulainen <tko@litl.com> | 2009-02-19 19:06:47 +0000 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@gmail.com> | 2009-02-20 10:10:21 +0000 |
| commit | f657b15c68f8124e66a7c14d17bcda9e77d2b029 (patch) | |
| tree | 8748f8ebcf988c4e443f00b11ecdd874f014de10 | |
| parent | ec97655379010edb56a707bc377d78ec80cae657 (diff) | |
add CXX support
| -rw-r--r-- | shave/shave.in | 12 | ||||
| -rw-r--r-- | shave/shave.m4 | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/shave/shave.in b/shave/shave.in index 5098f6f..487596e 100644 --- a/shave/shave.in +++ b/shave/shave.in @@ -41,14 +41,14 @@ while test "$#" -gt 0; do done # mode=link is handled in the libtool wrapper -case "$mode" in -compile) - Q=" CC " - ;; -link) +case "$mode,$tool" in +link,*) pass_through=1 ;; -*) +compile,cxx) + Q=" CXX " + ;; +compile,cc|*,*) # no "libtool" mode has been given, we are called by the Makefile: # -> assume compilation mode=compile diff --git a/shave/shave.m4 b/shave/shave.m4 index 54482db..5b1f675 100644 --- a/shave/shave.m4 +++ b/shave/shave.m4 @@ -29,8 +29,12 @@ LIBTOOL="\$(SHELL) \$(shavedir)/shave-libtool '\$(SHAVE_SAVED_LIBTOOL)'" AC_SUBST(LIBTOOL) dnl substitute cc SHAVE_SAVED_CC=$CC +SHAVE_SAVED_CXX=$CXX AC_SUBST(SHAVE_SAVED_CC) +AC_SUBST(SHAVE_SAVED_CXX) CC="\$(SHELL) \$(shavedir)/shave cc '\$(SHAVE_SAVED_CC)'" +CXX="\$(SHELL) \$(shavedir)/shave cxx '\$(SHAVE_SAVED_CXX)'" AC_SUBST(CC) +AC_SUBST(CXX) ]) |