diff --git a/boot/linux-x86_64/BUILD.go b/boot/linux-x86_64/BUILD.go
index 193e20e..09ce5ea 100644
--- a/boot/linux-x86_64/BUILD.go
+++ b/boot/linux-x86_64/BUILD.go
@@ -51,9 +51,9 @@ var bootLast = cc.Library{
 	Toolchain:  bootToolchain,
 }
 
-var Toolchain = bootToolchain.NewWithStdLib(
+var Toolchain = cc.RegisterToolchain(bootToolchain.NewWithStdLib(
 	bootToolchain.Includes,
 	append(bootToolchain.StdDeps(), bootLast, bootFirst),
 	bootToolchain.LinkerScript,
 	bootToolchain.Name(),
-).Register()
+))
diff --git a/boot/raspi3/BUILD.go b/boot/raspi3/BUILD.go
index 9493a5b..4c608c4 100644
--- a/boot/raspi3/BUILD.go
+++ b/boot/raspi3/BUILD.go
@@ -47,9 +47,9 @@ var bootLast = cc.Library{
 	Toolchain:  bootToolchain,
 }
 
-var Toolchain = bootToolchain.NewWithStdLib(
+var Toolchain = cc.RegisterToolchain(bootToolchain.NewWithStdLib(
 	bootToolchain.Includes,
 	append(bootToolchain.StdDeps(), bootLast, bootFirst),
 	bootToolchain.LinkerScript,
 	bootToolchain.Name(),
-).Register()
+))
diff --git a/boot/x86_64/BUILD.go b/boot/x86_64/BUILD.go
index f4d30fe..5eb2bff 100644
--- a/boot/x86_64/BUILD.go
+++ b/boot/x86_64/BUILD.go
@@ -52,9 +52,9 @@ var bootLast = cc.Library{
 	Toolchain:  bootToolchain,
 }
 
-var Toolchain = bootToolchain.NewWithStdLib(
+var Toolchain = cc.RegisterToolchain(bootToolchain.NewWithStdLib(
 	bootToolchain.Includes,
 	append(bootToolchain.StdDeps(), bootLast, bootFirst),
 	bootToolchain.LinkerScript,
 	bootToolchain.Name(),
-).Register()
+))