diff --git a/scripts/base.py b/scripts/base.py
index ccc2b99..9523f13 100644
--- a/scripts/base.py
+++ b/scripts/base.py
@@ -1902,8 +1902,8 @@ def set_sysroot_env(platform):
   if path != "":
     os.environ['PATH'] = path + "/usr/bin:" + get_env("PATH")
     os.environ['LD_LIBRARY_PATH'] = config.get_custom_sysroot_lib(platform)
-    os.environ['CC'] = config.get_custom_sysroot_bin() + "/gcc"
-    os.environ['CXX'] = config.get_custom_sysroot_bin() + "/g++"
+    os.environ['CC'] = config.get_custom_sysroot_bin(platform) + "/gcc"
+    os.environ['CXX'] = config.get_custom_sysroot_bin(platform) + "/g++"
     os.environ['CFLAGS'] = "--sysroot=" + path
     os.environ['CXXFLAGS'] = "--sysroot=" + path
     check_python()
diff --git a/scripts/core_common/modules/boost_qt.py b/scripts/core_common/modules/boost_qt.py
index 537c0ee..639671f 100644
--- a/scripts/core_common/modules/boost_qt.py
+++ b/scripts/core_common/modules/boost_qt.py
@@ -16,7 +16,7 @@ def make(src_dir, modules, build_platform="android", qmake_addon=""):
   
   # for b2 checks
   if config.option("sysroot") != "":
-    base.set_sysroot_env()
+    base.set_sysroot_env(build_platform)
     sysroot_path = config.option("sysroot_" + build_platform)
     b2_addon = "cflags=\"--sysroot=" + sysroot_path + "\""
     b2_addon = "cxxflags=\"--sysroot=" + sysroot_path + "\""
diff --git a/scripts/core_common/modules/v8_89.py b/scripts/core_common/modules/v8_89.py
index ed92227..bcfedb8 100644
--- a/scripts/core_common/modules/v8_89.py
+++ b/scripts/core_common/modules/v8_89.py
@@ -246,7 +246,7 @@ def make():
       base.replaceInFile("build/toolchain/linux/BUILD.gn", src_replace, dst_replace)
       
       old_env = dict(os.environ)
-      base.set_sysroot_env()
+      base.set_sysroot_env("linux_64")
       base.cmd2("gn", ["gen", "out.gn/linux_64", make_args(gn_args, "linux")], False)
       base.cmd2("ninja", ["-C", "out.gn/linux_64"], False)
       base.restore_sysroot_env()