projects
/
gnulib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3e2b354
)
autoupdate
author
Karl Berry
<karl@freefriends.org>
Wed, 22 Sep 2010 14:12:30 +0000
(07:12 -0700)
committer
Karl Berry
<karl@freefriends.org>
Wed, 22 Sep 2010 14:12:30 +0000
(07:12 -0700)
build-aux/compile
patch
|
blob
|
history
diff --git
a/build-aux/compile
b/build-aux/compile
index
77f8f31
..
46caccc
100755
(executable)
--- a/
build-aux/compile
+++ b/
build-aux/compile
@@
-1,7
+1,7
@@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
-scriptversion=2010-0
8-31.19
; # UTC
+scriptversion=2010-0
9-21.14
; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
# Foundation, Inc.
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
# Foundation, Inc.
@@
-80,10
+80,12
@@
func_file_conv ()
}
# func_cl_wrapper cl arg...
}
# func_cl_wrapper cl arg...
-# Adjust compile command to suit
e
cl
+# Adjust compile command to suit cl
func_cl_wrapper ()
{
# Assume a capable shell
func_cl_wrapper ()
{
# Assume a capable shell
+ lib_path=
+ shared=:
linker_opts=
for arg
do
linker_opts=
for arg
do
@@
-113,13
+115,41
@@
func_cl_wrapper ()
shift
;;
-l*)
shift
;;
-l*)
- set x "$@" "${1#-l}.lib"
+ lib=${1#-l}
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ set x "$@" "$dir/$lib.dll.lib"
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ set x "$@" "$dir/$lib.lib"
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ test "$found" != yes && set x "$@" "$lib.lib"
shift
;;
-L*)
func_file_conv "${1#-L}"
shift
;;
-L*)
func_file_conv "${1#-L}"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
linker_opts="$linker_opts -LIBPATH:$file"
;;
linker_opts="$linker_opts -LIBPATH:$file"
;;
+ -static)
+ shared=false
+ ;;
-Wl,*)
arg=${1#-Wl,}
save_ifs="$IFS"; IFS=','
-Wl,*)
arg=${1#-Wl,}
save_ifs="$IFS"; IFS=','