More stuff

host-recipes/binutils/recipe.star

@@ -13,12 +13,11 @@ source = {
 host_deps = []
 
 def configure(ctx):
-    triple = ctx.options["target_triple"]
     ctx.run([
         ctx.source_dir + "/configure",
         "--prefix=" + ctx.prefix,
-        "--target=" + triple,
-        "--with-sysroot=" + ctx.prefix + "/" + triple,
+        "--target=" + OPTIONS.target_triple,
+        "--with-sysroot=" + ctx.prefix + "/" + OPTIONS.target_triple,
         "--disable-nls",
         "--disable-werror",
         "--enable-deterministic-archives",
@@ -29,9 +28,9 @@ def configure(ctx):
         # gprofng's libcollector does not build against musl/recent gcc.
         "--disable-gprofng",
     ], env = {
-        "CFLAGS": ctx.options["host_cflags"],
-        "CXXFLAGS": ctx.options["host_cxxflags"],
-        "LDFLAGS": ctx.options["host_ldflags"],
+        "CFLAGS": OPTIONS.host_cflags,
+        "CXXFLAGS": OPTIONS.host_cxxflags,
+        "LDFLAGS": OPTIONS.host_ldflags,
     })
 
 def build(ctx):

host-recipes/gcc/recipe.star

@@ -13,12 +13,11 @@ source = {
 host_deps = ["binutils"]
 
 def configure(ctx):
-    triple = ctx.options["target_triple"]
     ctx.run([
         ctx.source_dir + "/configure",
         "--prefix=" + ctx.prefix,
-        "--target=" + triple,
-        "--with-sysroot=" + ctx.prefix + "/" + triple,
+        "--target=" + OPTIONS.target_triple,
+        "--with-sysroot=" + ctx.prefix + "/" + OPTIONS.target_triple,
         "--without-headers",
         "--with-newlib",
         "--enable-languages=c,c++",
@@ -34,9 +33,9 @@ def configure(ctx):
         "--disable-libvtv",
         "--disable-multilib",
     ], env = {
-        "CFLAGS": ctx.options["host_cflags"],
-        "CXXFLAGS": ctx.options["host_cxxflags"],
-        "LDFLAGS": ctx.options["host_ldflags"],
+        "CFLAGS": OPTIONS.host_cflags,
+        "CXXFLAGS": OPTIONS.host_cxxflags,
+        "LDFLAGS": OPTIONS.host_ldflags,
     })
 
 def build(ctx):