-
Thierry Escande authored
This moves the 3.0 specific patches and files to an openharmony-3.0 directory. Instead of using DISTRO_VERSION, this now uses OHOS_VERSION to determine which OpenHarmony is built. DISTRO_VERSION has been reset to 1.99.99 to stick to oniro-core and avoid confusion with OpenHarmony version (3.0 or 3.1 for now). Signed-off-by:
Thierry Escande <thierry.escande@huawei.com>
Thierry Escande authoredThis moves the 3.0 specific patches and files to an openharmony-3.0 directory. Instead of using DISTRO_VERSION, this now uses OHOS_VERSION to determine which OpenHarmony is built. DISTRO_VERSION has been reset to 1.99.99 to stick to oniro-core and avoid confusion with OpenHarmony version (3.0 or 3.1 for now). Signed-off-by:
Thierry Escande <thierry.escande@huawei.com>
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
kernel_linux_build.patch 1.59 KiB
# SPDX-FileCopyrightText: Huawei Inc.
#
# SPDX-License-Identifier: Apache-2.0
Patch for //kernel/linux/build git repository of OpenHarmony 3.0 codebase.
This integrates with the oniro-ohos-bundle being installed into
//oniro, configuring the codebase to use the toolchain and third party
components provided in //oniro.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
Upstream-Status: Inappropriate [configuration/integration]
diff --git a/kernel/linux/build/kernel.mk b/kernel/linux/build/kernel.mk
index 56fcde79ef55..84789e66b759 100644
--- a/kernel/linux/build/kernel.mk
+++ b/kernel/linux/build/kernel.mk
@@ -27,7 +27,7 @@ KERNEL_SRC_PATH := $(OHOS_BUILD_HOME)/kernel/linux/${KERNEL_VERSION}
KERNEL_PATCH_PATH := $(OHOS_BUILD_HOME)/kernel/linux/patches/${KERNEL_VERSION}
KERNEL_CONFIG_PATH := $(OHOS_BUILD_HOME)/kernel/linux/config/${KERNEL_VERSION}
PREBUILTS_GCC_DIR := $(OHOS_BUILD_HOME)/prebuilts/gcc
-CLANG_HOST_TOOLCHAIN := $(OHOS_BUILD_HOME)/prebuilts/clang/ohos/linux-x86_64/llvm/bin
+CLANG_HOST_TOOLCHAIN := $(OHOS_BUILD_HOME)/oniro/sysroots/host/usr/bin
KERNEL_HOSTCC := $(CLANG_HOST_TOOLCHAIN)/clang
KERNEL_PREBUILT_MAKE := make
@@ -48,7 +48,8 @@ KERNEL_PERL := /usr/bin/perl
KERNEL_CROSS_COMPILE :=
KERNEL_CROSS_COMPILE += CC="$(CLANG_CC)"
ifeq ($(BUILD_TYPE), standard)
- KERNEL_CROSS_COMPILE += HOSTCC="$(KERNEL_HOSTCC)"
+ HOST_SYSROOT=$(OHOS_BUILD_HOME)/oniro/sysroots/host
+ KERNEL_CROSS_COMPILE += HOSTCC="gcc"
KERNEL_CROSS_COMPILE += PERL=$(KERNEL_PERL)
KERNEL_CROSS_COMPILE += CROSS_COMPILE="$(KERNEL_TARGET_TOOLCHAIN_PREFIX)"
else ifeq ($(BUILD_TYPE), small)