rustpkg: Don't execute the standard build logic if there is a pkg.rs

catamorphism · catamorphism · commit e2d947d72f78 · 2013-04-17T18:58:59.000-07:00
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -234,13 +234,14 @@ impl Ctx {`
`234`	`234`	`}`
`235`	`235`	`};`
`236`	`236`
`237`		`- // Find crates inside the workspace`
	`237`	`+ // If there was a package script, it should have finished`
	`238`	`+ // the build already. Otherwise...`
`238`	`239`	`if !custom {`
	`240`	`+ // Find crates inside the workspace`
`239`	`241`	`src.find_crates();`
	`242`	`+ // Build it!`
	`243`	`+ src.build(&dst_dir, cfgs);`
`240`	`244`	`}`
`241`		`-`
`242`		`- // Build it!`
`243`		`- src.build(&dst_dir, cfgs);`
`244`	`245`	`}`
`245`	`246`	`~"clean" => {`
`246`	`247`	`if args.len() < 1 {`