summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-06-06 19:14:52 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-06-06 19:14:52 (GMT)
commit263c57146c81d06dd031e0e16d14c4ba87d7c3f6 (patch)
tree18ede611f4d2a03ab18c29ef32f87d1ebf5913b1
parent7a7d7ef113c2e10d922fb613e24cb17f574f12e6 (diff)
downloadswift-263c57146c81d06dd031e0e16d14c4ba87d7c3f6.zip
swift-263c57146c81d06dd031e0e16d14c4ba87d7c3f6.tar.bz2
Work around clashing 'link' command in cccl.
-rwxr-xr-xautoconf/cccl4
1 files changed, 4 insertions, 0 deletions
diff --git a/autoconf/cccl b/autoconf/cccl
index 9bbb25a..14c35a7 100755
--- a/autoconf/cccl
+++ b/autoconf/cccl
@@ -33,6 +33,10 @@ 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="//"