X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=build-aux%2Fcccl;h=d6915aaffc9d4c18014937df419523f46a454a2a;hb=ec988646afe6aee6a63d6894a3e9b50f715d5941;hp=c614ecbf50c8c25ada408b3750504e78dc52db51;hpb=f4e0e0949ab41b230828a98bd72545d40396a370;p=sliver-openvswitch.git

diff --git a/build-aux/cccl b/build-aux/cccl
index c614ecbf5..d6915aaff 100644
--- a/build-aux/cccl
+++ b/build-aux/cccl
@@ -33,10 +33,6 @@ EOF
     exit $1
 }
 
-# Put /usr/bin last in the path, to avoid clashes with MSVC's link
-# Ugly workaround, but should work
-PATH=`echo $PATH | sed -e "s#/usr/bin:##" | sed -e "s#/bin:##"`:/usr/bin
-
 case $MACHTYPE in
     *-msys)
         slash="-"
@@ -90,20 +86,18 @@ EOF
     -g[0-9] | -g)
         # cl only supports one debugging level
         clopt="$clopt ${slash}Zi"
+        linkopt="$linkopt ${slash}DEBUG"
         ;;
 
     -L*)
         path=`echo "$1" | sed 's/-L//'`
-        linkopt="$linkopt /LIBPATH:$path"
+        linkopt="$linkopt ${slash}LIBPATH:$path"
+        cl_linkopt="${slash}link ${slash}LIBPATH:\"$path\""
         ;;
 
     -l*)
         lib=`echo "$1" | sed 's/-l//'`
-    if [ $lib != "dnsapi" -a $lib != "ws2_32" -a $lib != "wsock32" ]; then
-      lib="lib$lib.lib"
-    else
-      lib="$lib.lib"
-    fi
+        lib="$lib.lib"
 
         clopt="$clopt $lib"
         linkopt="$linkopt $lib"
@@ -191,7 +185,7 @@ fi
 
 # choose which opts we built up based on which program will actually run
 if test x$prog = xcl ; then
-    opts=$clopt
+    opts="$clopt $cl_linkopt"
 else
     opts=$linkopt
 fi