aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel/zephyr-kernel/files/0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch
blob: caab16fa26bfdb319e45ea3530e9f41cd0256e27 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
From 511745625637da0effca13c5489a392e15d32271 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Tue, 31 Mar 2020 13:22:17 +0800
Subject: [PATCH] cmake: add yocto toolchain

Upstream status: inappropriate [OE specific]

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
 cmake/compiler/gcc/target.cmake     |  7 -------
 cmake/toolchain/yocto/generic.cmake | 13 +++++++++++++
 cmake/toolchain/yocto/target.cmake  |  1 +
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 cmake/toolchain/yocto/generic.cmake
 create mode 100644 cmake/toolchain/yocto/target.cmake

diff --git a/cmake/compiler/gcc/target.cmake b/cmake/compiler/gcc/target.cmake
index 401cc28db8..5a026f4559 100644
--- a/cmake/compiler/gcc/target.cmake
+++ b/cmake/compiler/gcc/target.cmake
@@ -66,13 +66,6 @@ if(NOT no_libgcc)
     OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
-  assert_exists(LIBGCC_FILE_NAME)
-
-  get_filename_component(LIBGCC_DIR ${LIBGCC_FILE_NAME} DIRECTORY)
-
-  assert_exists(LIBGCC_DIR)
-
-  LIST(APPEND LIB_INCLUDE_DIR "-L\"${LIBGCC_DIR}\"")
   LIST(APPEND TOOLCHAIN_LIBS gcc)
 endif()
 
diff --git a/cmake/toolchain/yocto/generic.cmake b/cmake/toolchain/yocto/generic.cmake
new file mode 100644
index 0000000000..45e5777e2a
--- /dev/null
+++ b/cmake/toolchain/yocto/generic.cmake
@@ -0,0 +1,13 @@
+set(COMPILER gcc)
+set(LINKER ld)
+set(BINTOOLS gnu)
+
+set(ZEPHYR_SYSROOT ${ZEPHYR_SYSROOT})
+set(SYSROOT_DIR ${ZEPHYR_SYSROOT})
+set(LIBC_LIBRARY_DIR "\"${SYSROOT_DIR}\"/")
+set(LIBC_INCLUDE_DIR ${SYSROOT_DIR}/include)
+LIST(APPEND TOOLCHAIN_LIBS gcc)
+
+LIST(APPEND LIB_INCLUDE_DIR "-L\"${STAGING_LIBDIR}\"")
+
+set(TOOLCHAIN_LIBS gcc)
diff --git a/cmake/toolchain/yocto/target.cmake b/cmake/toolchain/yocto/target.cmake
new file mode 100644
index 0000000000..9881313609
--- /dev/null
+++ b/cmake/toolchain/yocto/target.cmake
@@ -0,0 +1 @@
+# SPDX-License-Identifier: Apache-2.0
-- 
2.17.1