about summary refs log tree commit diff
path: root/src/librustpkg
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2013-04-17 18:58:59 -0700
committerTim Chevalier <chevalier@alum.wellesley.edu>2013-04-17 18:58:59 -0700
commite2d947d72f78ea195585fd2fc10e2a7bd8d274a4 (patch)
tree1fe237fb3e3aa00b77a30e2e0dc7b24722581216 /src/librustpkg
parenta2761ac7b528eeeba375e0b0be0140fc1e5c50b3 (diff)
downloadrust-e2d947d72f78ea195585fd2fc10e2a7bd8d274a4.tar.gz
rust-e2d947d72f78ea195585fd2fc10e2a7bd8d274a4.zip
rustpkg: Don't execute the standard build logic if there is a pkg.rs
Diffstat (limited to 'src/librustpkg')
-rw-r--r--src/librustpkg/rustpkg.rc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rc
index b3b47e7aeda..ca8161067c2 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 {