@@ -334,47 +334,45 @@ func main() {
334334 log .Printf ("getgo errored, %v, keep going" , err )
335335 }
336336
337- // Some things need GOOS and GOARCH awareness in surprising ways. Modules are once such.
338- for _ , kern := range kernels {
339- for _ , arch := range archs {
340- bin = filepath .Join (fmt .Sprintf ("%v_%v" , kern , arch ), "bin" )
341- if err := os .MkdirAll (filepath .Join (d , bin ), 0755 ); err != nil {
342- log .Fatal (err )
343- }
344-
345- if err := buildToolchain (d , kern , arch ); err != nil {
346- log .Fatal (err )
347- }
348- }
349- }
350337 if err := os .MkdirAll (filepath .Join (d , "src" ), 0755 ); err != nil {
351338 log .Fatal (err )
352339 }
353340 if err := get (
filepath .
Join (
d ,
"src" ),
kernels ,
archs ,
append (
flag .
Args (),
"[email protected] :u-root/sourcery" )
... );
err != nil {
354341 log .Fatalf ("Getting packages: %v" , err )
355342 }
356343
357- if err := files (d , bin , filepath .Join (d , bin )); err != nil {
358- log .Fatal (err )
359- }
360-
361344 baseToolPath := filepath .Join (d , bin )
362345 if * development {
363346 baseToolPath = pwd
364347 }
365- V ("Build tools from %q" , baseToolPath )
348+
349+ // Some things need GOOS and GOARCH awareness in surprising ways. Modules are once such.
366350 for _ , kern := range kernels {
367351 for _ , arch := range archs {
352+ bin = filepath .Join (fmt .Sprintf ("%v_%v" , kern , arch ), "bin" )
353+ if err := os .MkdirAll (filepath .Join (d , bin ), 0755 ); err != nil {
354+ log .Fatal (err )
355+ }
356+
357+ if err := buildToolchain (d , kern , arch ); err != nil {
358+ log .Fatal (err )
359+ }
360+
361+ if err := files (d , bin , filepath .Join (d , bin )); err != nil {
362+ log .Fatal (err )
363+ }
364+
365+ V ("Build tools from %q" , baseToolPath )
368366 for _ , tool := range []string {"installcommand" , "init" } {
369367 goBin := filepath .Join (d , bin , tool )
370368 V ("Build %q in %q, install to %q" , tool , baseToolPath , goBin )
371369 if err := build (d , baseToolPath , tool , goBin , kern , arch ); err != nil {
372370 log .Fatalf ("Building %q -> %q: %v" , goBin , tool , err )
373371 }
374372 }
375-
376373 }
377374 }
375+
378376 if * outCPIO != "" {
379377 if err := ramfs (d , * outCPIO ); err != nil {
380378 log .Printf ("ramfs: %v" , err )
0 commit comments