From 8ff61ee0734ce31b574afa282a50aabca2a5e4e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9D=B4=EC=B6=98=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Senior=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Tue, 20 Mar 2018 17:48:35 +0900 Subject: [PATCH] Fix armv7l native build fail on obs (#93) 1. Add option_armv7l-tizen.cmake 2. Set default HOST_OS to be linux Signed-off-by: Chunseok Lee --- CMakeLists.txt | 3 --- Makefile | 2 ++ cmake/option/option_armv7l-tizen.cmake | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 cmake/option/option_armv7l-tizen.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 4454dae..1b22552 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,9 +41,6 @@ else() set(BUILD_IS_NATIVE False) endif() -# TODO add Tizen -# We don't allow cross-os build now -set(HOST_OS "linux") set(TARGET_OS ${HOST_OS}) # host & target platform name diff --git a/Makefile b/Makefile index 9c1bc2b..6cf5a59 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ TARGET_ARCH?=$(shell uname -p) BUILD_TYPE?=Debug CROSS_BUILD?=0 +HOST_OS?=linux # make TARGET and TYPE to lowercase TARGET_ARCH_LC=$(shell echo $(TARGET_ARCH) | tr A-Z a-z) @@ -63,6 +64,7 @@ configure_internal: cmake -B$(CURDIR)/$(BUILD_ROOT) -H$(CURDIR) \ -DCMAKE_INSTALL_PREFIX=$(INSTALL_PATH) \ -DCMAKE_BUILD_TYPE=$(BUILD_TYPE_LC) -DTARGET_ARCH=$(TARGET_ARCH_LC) \ + -DHOST_OS=$(HOST_OS) \ $(OPTION_TOOLCHAIN) touch $(TIMESTAMP_CONFIGURE) diff --git a/cmake/option/option_armv7l-tizen.cmake b/cmake/option/option_armv7l-tizen.cmake new file mode 100644 index 0000000..561f8d5 --- /dev/null +++ b/cmake/option/option_armv7l-tizen.cmake @@ -0,0 +1,19 @@ +# +# armv7l linux compile options +# + +message(STATUS "Building for ARMv7l(softfp) Tizen") + +# include linux common +include("cmake/option/option_linux.cmake") + +# TODO : support rootfs setting for tizen cross-build + +# addition for arm-linux +set(FLAGS_COMMON ${FLAGS_COMMON} + "-mcpu=cortex-a8" + "-mfloat-abi=softfp" + "-mfpu=neon-vfpv4" + "-funsafe-math-optimizations" + "-ftree-vectorize" + ) -- 2.7.4