Tizen i686 target build fix

diff --git a/packaging/heaptrack.spec b/packaging/heaptrack.spec
index 22fcf16b2efaf368835b6bd93fe3bb3f9ba90f94..6d88bdbd180e41d313184bc7b7c9e2cb1b82f9a9 100644 (file)
--- a/packaging/heaptrack.spec
+++ b/packaging/heaptrack.spec
@@ -61,11 +61,17 @@ cmake \
   -DHEAPTRACK_BUILD_GUI=OFF \
        .
 
+%ifarch %{arm}
+%define arch_dir armel
+%else
+%define arch_dir x86
+%endif
+
 cd profiler; 
        ROOTFS_DIR=/ \
        CC=clang CXX=clang++ \
        cmake \
-       -DCMAKE_TOOLCHAIN_FILE=profiler/cross/armel/toolchain.cmake \
+       -DCMAKE_TOOLCHAIN_FILE=profiler/cross/%{arch_dir}/toolchain.cmake \
        -DCLR_BIN_DIR=%{_coreclr_devel_directory} \
        -DCLR_SRC_DIR=%{_coreclr_devel_directory} \
        -DCLR_ARCH=%{_target_cpu} \

diff --git a/profiler/profiler/cross/x86/toolchain.cmake b/profiler/profiler/cross/x86/toolchain.cmake
new file mode 100644 (file)
index 0000000..67ea813
--- /dev/null
+++ b/profiler/profiler/cross/x86/toolchain.cmake
@@ -0,0 +1,26 @@
+set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR i686)
+
+add_compile_options("-m32")
+add_compile_options("--sysroot=${CROSS_ROOTFS}")
+
+## Specify the toolchain
+set(TOOLCHAIN "i586-tizen-linux-gnu")
+set(TOOLCHAIN_PREFIX ${TOOLCHAIN}-)
+
+if ("$ENV{CC}" MATCHES "lang")
+    add_compile_options(--target=i686-tizen-linux-gnu)
+endif()
+
+if ("$ENV{CC}" MATCHES "lang")
+    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -target i686-linux-gnu")
+    set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}/6.2.1")
+endif()
+set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}/6.2.1")
+set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}")
+
+set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS}    ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE)
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE)
+set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE)
+