From e2d947d72f78ea195585fd2fc10e2a7bd8d274a4 Mon Sep 17 00:00:00 2001
From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Wed, 17 Apr 2013 18:58:59 -0700
Subject: [PATCH] rustpkg: Don't execute the standard build logic if there is a
 pkg.rs

---
 src/librustpkg/rustpkg.rc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rc
index b3b47e7aeda1..ca8161067c2b 100644
--- a/src/librustpkg/rustpkg.rc
+++ b/src/librustpkg/rustpkg.rc
@@ -234,13 +234,14 @@ impl Ctx {
                     }
                 };
 
-                // Find crates inside the workspace
+                // If there was a package script, it should have finished
+                // the build already. Otherwise...
                 if !custom {
+                    // Find crates inside the workspace
                     src.find_crates();
+                    // Build it!
+                    src.build(&dst_dir, cfgs);
                 }
-
-                // Build it!
-                src.build(&dst_dir, cfgs);
             }
             ~"clean" => {
                 if args.len() < 1 {