fix: drop TOOLCHAIN from std vars

See siderolabs/toolchain#129

Signed-off-by: Andrey Smirnov <[email protected]>

Author: smira

internal/pkg/environment/default.go

@@ -5,21 +5,18 @@
 package environment
 
 import (
-	"fmt"
-
 	"github.com/siderolabs/bldr/internal/pkg/constants"
 	"github.com/siderolabs/bldr/internal/pkg/types"
 )
 
 // Default returns default values for environment variables.
 func Default() types.Variables {
 	return types.Variables{
-		"CFLAGS":    "-g0 -Os",
-		"CXXFLAGS":  "-g0 -Os",
-		"LDFLAGS":   "-s",
-		"VENDOR":    "talos",
-		"SYSROOT":   "/talos",
-		"TOOLCHAIN": "/toolchain",
-		"PATH":      fmt.Sprintf("/toolchain/bin:%s", constants.DefaultPath),
+		"CFLAGS":   "-g0 -Os",
+		"CXXFLAGS": "-g0 -Os",
+		"LDFLAGS":  "-s",
+		"VENDOR":   "talos",
+		"SYSROOT":  "/talos",
+		"PATH":     constants.DefaultPath,
 	}
 }

internal/pkg/integration/testdata/variables/final/pkg.yaml

@@ -10,7 +10,7 @@ steps:
     - test -f /result/global_A
     - test -f /result/global_B
     - test -f /result/talos
-    - test -d /result/toolchain
+    - test -d /result/a-talos
     - test -f /result/toplevel
     - test -f /result/toplevel-toplevel-packagelevel
     - test -f /result/testtag

internal/pkg/integration/testdata/variables/std-vars/pkg.yaml

@@ -6,7 +6,7 @@ steps:
 
   build:
     - touch /root/{{ .VENDOR }} # std vars are available for templates
-    - mkdir  /root$TOOLCHAIN  # std vars are available as env vars
+    - mkdir  /root/a-$VENDOR  # std vars are available as env vars
 
   test:
     - test "${PATH:-x}" = "{{ .PATH }}" # std vars are available as env vars and templates