summaryrefslogtreecommitdiff
path: root/packaging/tizen-toolchain-support.patch
blob: 531bf781c6f0a9ca76835aa587886e63dd38bc24 (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
From 8f291c286db9813e6c797030707b41872b9616a6 Mon Sep 17 00:00:00 2001
From: Jiyoung Yun <jy910.yun@samsung.com>
Date: Fri, 14 Jul 2017 11:58:39 +0900
Subject: [PATCH] tizen toolchain support

Change-Id: Idb48d26dc1dfff8a6dc758b90bc94cb48963f8a2
---
 compileoptions.cmake        | 2 +-
 cross/armel/toolchain.cmake | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/compileoptions.cmake b/compileoptions.cmake
index 75d51fd..4649ea3 100644
--- a/compileoptions.cmake
+++ b/compileoptions.cmake
@@ -59,7 +59,7 @@ if(CLR_CMAKE_PLATFORM_UNIX_ARM)
    if(ARM_SOFTFP)
      add_definitions(-DARM_SOFTFP)
      add_compile_options(-mfloat-abi=softfp)
-     add_compile_options(-target armv7-linux-gnueabi)
+     add_compile_options(-target armv7l-tizen-linux-gnueabi)
    else()
      add_compile_options(-target armv7-linux-gnueabihf)
    endif(ARM_SOFTFP)
diff --git a/cross/armel/toolchain.cmake b/cross/armel/toolchain.cmake
index 86e2306..84f41f1 100644
--- a/cross/armel/toolchain.cmake
+++ b/cross/armel/toolchain.cmake
@@ -16,16 +16,9 @@ set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -target ${TOOLCHAIN}")
 set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}")
 
 if("$ENV{__DistroRid}" MATCHES "tizen.*")
-    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/6.2.1")
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
+    add_compile_options(-target armv7l-tizen-linux-gnueabi)
     add_compile_options(-Wno-deprecated-declarations) # compile-time option
     add_compile_options(-D__extern_always_inline=inline) # compile-time option
-
-    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
-    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib")
-    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib")
-    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
 else()
     # TODO: this setting assumes debian armel rootfs
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/include/c++/4.9)
-- 
1.9.1