From: Gurucharan Shetty <gshetty@nicira.com>
Date: Wed, 29 Jan 2014 23:28:42 +0000 (-0800)
Subject: BUILD.Windows: Clarify on the correct linker.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=57cfcebdf168d18549c888acf63b521991ba6c4e;p=sliver-openvswitch.git

BUILD.Windows: Clarify on the correct linker.

This has tripped a couple of people.

The workaround in cccl does not actually work. So get rid of it and
clarify in documentation.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
---

diff --git a/BUILD.Windows b/BUILD.Windows
index 7012bcf48..33b75daa7 100644
--- a/BUILD.Windows
+++ b/BUILD.Windows
@@ -30,6 +30,10 @@ to have the $PATH inside the bash to point to the proper compiler and linker.
 One easy way to achieve this is to get into the "Developer Command prompt for
 visual studio" and through it enter into the bash shell available from msys.
 
+If after the above step, a 'which link' inside MSYS's bash says,
+"/bin/link.exe", rename /bin/link.exe to something else so that the
+Visual studio's linker is used.
+
 * Get the Open vSwitch sources from either cloning the repo using git
 or from a distribution tar ball.
 
diff --git a/build-aux/cccl b/build-aux/cccl
index f6972d474..7914b4061 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="-"