---

yaml
---
r: 10743
b: refs/heads/master
c: c2bf9b7
h: refs/heads/master
i:
  10741: b326fb5
  10739: f72b183
  10735: 527c271
v: v3

Author: crabtw

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fe70212f5a8450081c5ac60e996892338c9170be
+refs/heads/master: c2bf9b7726b342b892b8cd773ac9b97fd029ff1f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/configure

@@ -340,7 +340,8 @@ then
     CFG_CLANG_VERSION=$("$CFG_CLANG" \
                       --version \
                       | grep version \
-                      | cut -d ' ' -f 3)
+                      | sed 's/.*\(version .*\)/\1/' \
+                      | cut -d ' ' -f 2)
 
     case $CFG_CLANG_VERSION in
         (3.0svn | 3.0 | 3.1)

trunk/mk/platform.mk

@@ -188,7 +188,7 @@ ifeq ($(CFG_C_COMPILER),clang)
   CC=clang
   CXX=clang++
   CPP=cpp
-  CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g
+  CFG_GCCISH_CFLAGS += -Wall -Werror -Wno-c++11-compat -fno-rtti -g
   CFG_GCCISH_LINK_FLAGS += -g
   CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \
     -MM $(2)

trunk/src/cargo/cargo.rs

@@ -476,25 +476,6 @@ fn install_package(c: cargo, wd: str, pkg: package) {
     }
 }
 
-fn cargo_suggestion(c: cargo, syncing: bool, fallback: fn())
-{
-    if c.sources.size() == 0u {
-        error("No sources defined. You may wish to run " +
-              "\"cargo init\" then \"cargo sync\".");
-        ret;
-    }
-    if !syncing {
-        let npkg = 0u;
-        c.sources.values({ |v| npkg += vec::len(v.packages) });
-        if npkg == 0u {
-            error("No packages known. You may wish to run " +
-                  "\"cargo sync\".");
-            ret;
-        }
-    }
-    fallback();
-}
-
 fn install_uuid(c: cargo, wd: str, uuid: str) {
     let ps = [];
     for_each_package(c, { |s, p|
@@ -508,7 +489,7 @@ fn install_uuid(c: cargo, wd: str, uuid: str) {
         install_package(c, wd, p);
         ret;
     } else if vec::len(ps) == 0u {
-        cargo_suggestion(c, false, { || error("No packages match uuid."); });
+        error("No packages.");
         ret;
     }
     error("Found multiple packages:");
@@ -529,7 +510,7 @@ fn install_named(c: cargo, wd: str, name: str) {
         install_package(c, wd, p);
         ret;
     } else if vec::len(ps) == 0u {
-        cargo_suggestion(c, false, { || error("No packages match name."); });
+        error("No packages.");
         ret;
     }
     error("Found multiple packages:");
@@ -670,7 +651,6 @@ fn cmd_sync(c: cargo, argv: [str]) {
     if vec::len(argv) == 3u {
         sync_one(c, argv[2], c.sources.get(argv[2]));
     } else {
-        cargo_suggestion(c, true, { || } );
         c.sources.items { |k, v|
             sync_one(c, k, v);
         }

trunk/src/rt/rust_unwind.h

@@ -17,10 +17,14 @@ typedef int _Unwind_Reason_Code;
 
 #if (defined __APPLE__) || (defined __clang__)
 
+#ifndef __FreeBSD__
+
 typedef int _Unwind_Action;
 typedef void _Unwind_Exception;
 
 #endif
 
 #endif
 
+#endif
+