plugin: kernel: use new CRAFT_ARCH_TRIPLET_BUILD_FOR variable

canonical · Oct 26, 2023 · 394cb31 · 394cb31
1 parent 1c9622f
commit 394cb31
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/snapcraft/parts/plugins/kernel_plugin.py b/snapcraft/parts/plugins/kernel_plugin.py
@@ -214,7 +214,7 @@ def _init_build_env(self) -> None:
     def _check_cross_compilation(self) -> None:
         if self._cross_building:
             self._make_cmd.append(f"ARCH={self._kernel_arch}")
-            self._make_cmd.append("CROSS_COMPILE=${CRAFT_ARCH_TRIPLET}-")
+            self._make_cmd.append("CROSS_COMPILE=${CRAFT_ARCH_TRIPLET_BUILD_FOR}-")
 
     def _set_kernel_targets(self) -> None:
         if not self.options.kernel_image_target:
@@ -317,7 +317,7 @@ def get_build_environment(self) -> Dict[str, str]:
         self._init_build_env()
 
         return {
-            "CROSS_COMPILE": "${CRAFT_ARCH_TRIPLET}-",
+            "CROSS_COMPILE": "${CRAFT_ARCH_TRIPLET_BUILD_FOR}-",
             "ARCH": self._kernel_arch,
             "DEB_ARCH": "${CRAFT_TARGET_ARCH}",
             "KERNEL_BUILD_ARCH_DIR": f"${{CRAFT_PART_BUILD}}/arch/{self._kernel_arch}/boot",
@@ -333,7 +333,7 @@ def get_build_commands(self) -> List[str]:
             make_targets=self._make_targets,
             make_install_targets=self._make_install_targets,
             target_arch=self._target_arch,
-            target_arch_triplet="${CRAFT_ARCH_TRIPLET}",
+            target_arch_triplet="${CRAFT_ARCH_TRIPLET_BUILD_FOR}",
             config_file=self.options.kernel_kconfigfile,
             config_flavour=self.options.kernel_kconfigflavour,
             defconfig=self.options.kernel_kdefconfig,