diff options
author | Karl Berry <karl@freefriends.org> | 2010-08-17 07:18:27 -0700 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-08-17 07:18:27 -0700 |
commit | 3f08220c1a263dfc45f6e0ce6dcee97631dd5e56 (patch) | |
tree | 6da46e3c8411edebe460d213f771db2374b10309 /build-aux | |
parent | 6f730e7ae5225bf9eb36554d94805b97a72784bd (diff) | |
download | gnulib-3f08220c1a263dfc45f6e0ce6dcee97631dd5e56.tar.gz |
autoupdate
Diffstat (limited to 'build-aux')
-rwxr-xr-x | build-aux/compile | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/build-aux/compile b/build-aux/compile index bdb4ccbb51..b6419cecf9 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2010-08-07.06; # UTC +scriptversion=2010-08-16.11; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software # Foundation, Inc. @@ -38,9 +38,11 @@ IFS=" "" $nl" file_conv= -# func_file_conv build_file +# func_file_conv build_file lazy # Convert a $build file to $host form and store it in $file -# Currently only supports Win32 hosts. +# Currently only supports Win32 hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. func_file_conv () { file=$1 @@ -60,14 +62,16 @@ func_file_conv () ;; esac fi - case $file_conv in - mingw) + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin) + cygwin/*) file=`cygpath -m "$file" || echo "$file"` ;; - wine) + wine/*) file=`winepath -w "$file" || echo "$file"` ;; esac @@ -104,7 +108,7 @@ func_cl_wrapper () esac ;; -I*) - func_file_conv "${1#-I}" + func_file_conv "${1#-I}" mingw set x "$@" -I"$file" shift ;; @@ -129,6 +133,20 @@ func_cl_wrapper () eat=1 linker_opts="$linker_opts $2" ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; *) set x "$@" "$1" shift |