Merge pull request #133 from rust-lang/next

brson · web-flow · commit 04adaefe5c0c · 2016-10-18T10:52:09.000-07:00
Really don't build new arm targets on beta/stable
diff --git a/master/master.cfg b/master/master.cfg
@@ -1850,6 +1850,8 @@ for p in dist_platforms:
         if channel == 'nightly':
             if 'cross-rustbuild-linux' in p:
                 musl = "arm"
+            else:
+                musl = None
 
         if channel == 'stable':
             my_cross_targets = stable_cross_targets
