diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-07-21 13:46:48 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-07-23 20:36:08 +0100 |
| commit | db6cb1847233d56c965a6d1e196dfb09f860ee97 (patch) | |
| tree | 2ee6503008891517d6936dccb45101c75ff97ae8 | |
| parent | 0ac06406dcc6cf9c5f1fbeef340764e73cc8eae0 (diff) | |
| download | automake-db6cb1847233d56c965a6d1e196dfb09f860ee97.tar.gz | |
test: avoid false positives in 'cc-no-c-o' script
Fixes automake bug#14911.
* t/ax/cc-no-c-o.in: Be more careful in determining whether both the
'-c' and '-o' options have been passed on the command line to the
compiler. In particular, do not spuriously complain in the face of
options like '-compatibility_version' or '-current_version' (seen on
Mac OS X 10.7).
* THANKS: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | t/ax/cc-no-c-o.in | 20 |
2 files changed, 17 insertions, 4 deletions
@@ -145,6 +145,7 @@ Gwenole Beauchesne gbeauchesne@mandrakesoft.com H.J. Lu hjl@lucon.org H.Merijn Brand h.m.brand@hccnet.nl Hans Ulrich Niedermann hun@n-dimensional.de +Hanspeter Niederstrasser fink@snaggledworks.com Harald Dunkel harald@CoWare.com Harlan Stenn Harlan.Stenn@pfcs.com He Li tippa000@yahoo.com diff --git a/t/ax/cc-no-c-o.in b/t/ax/cc-no-c-o.in index c18f9b975..bbc9ec900 100644 --- a/t/ax/cc-no-c-o.in +++ b/t/ax/cc-no-c-o.in @@ -19,11 +19,23 @@ am_CC=${AM_TESTSUITE_GNU_CC-'@GNU_CC@'} -case " $* " in - *\ -c*\ -o* | *\ -o*\ -c*) +seen_c=false +seen_o=false + +for arg +do + case $arg in + -c) + seen_c=true;; + # It is acceptable not to leave a space between the '-o' option + # and its argument, so we have to cater for that. + -o|-o*) + seen_o=true;; + esac + if $seen_c && $seen_o; then echo "$0: both '-o' and '-c' seen on the command line" >&2 exit 2 - ;; -esac + fi +done exec $am_CC "$@" |