diff options
| author | Hyeongseok Oh <hseok82.oh@samsung.com> | 2022-06-30 11:11:10 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-30 11:11:10 +0900 |
| commit | fef3827ff854c37d9e09fb3ed66f36dbf8d3bd47 (patch) | |
| tree | ff37fc2e70875aca2bde545ed0453bd9793db652 | |
| parent | c426200a29e4236c73562331c70e5bf35663c0a8 (diff) | |
| download | nnfw-fef3827ff854c37d9e09fb3ed66f36dbf8d3bd47.tar.gz nnfw-fef3827ff854c37d9e09fb3ed66f36dbf8d3bd47.tar.bz2 nnfw-fef3827ff854c37d9e09fb3ed66f36dbf8d3bd47.zip | |
[infra] Revisit linking sysroot flag setting (#9363)
Let's remove direct linking flag setting by `CMAKE_SHARED_LINKER_FLAGS` and `CMAKE_EXE_LINKER_FLAGS`.
This feature was required on cmake 2.x.
But since cmake 3.0, cmake pass `CMAKE_SYSROOT` as compile and linking flag `--sysroot` automatically.
So we don't need these direct flag setting any more.
Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
4 files changed, 0 insertions, 28 deletions
diff --git a/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-linux.cmake b/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-linux.cmake index 3356aa72d..07b26a937 100644 --- a/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-linux.cmake +++ b/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-linux.cmake @@ -21,12 +21,6 @@ endif() set(CMAKE_SYSROOT ${ROOTFS_DIR}) set(CMAKE_FIND_ROOT_PATH ${ROOTFS_DIR}) -set(CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} --sysroot=${ROOTFS_DIR}" - CACHE INTERNAL "" FORCE) -set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} --sysroot=${ROOTFS_DIR}" - CACHE INTERNAL "" FORCE) # search for programs in the build host directories set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) diff --git a/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-tizen.cmake b/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-tizen.cmake index 4d5d7ac56..cab7325dd 100644 --- a/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-tizen.cmake +++ b/infra/nnfw/cmake/buildtool/cross/toolchain_aarch64-tizen.cmake @@ -23,12 +23,6 @@ endif() set(CMAKE_SYSROOT ${ROOTFS_DIR}) set(CMAKE_FIND_ROOT_PATH ${ROOTFS_DIR}) -set(CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} --sysroot=${ROOTFS_DIR}" - CACHE INTERNAL "" FORCE) -set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} --sysroot=${ROOTFS_DIR}" - CACHE INTERNAL "" FORCE) # search for programs in the build host directories set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) diff --git a/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-linux.cmake b/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-linux.cmake index 8f2cb6735..c69259f85 100644 --- a/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-linux.cmake +++ b/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-linux.cmake @@ -21,12 +21,6 @@ endif() set(CMAKE_SYSROOT ${ROOTFS_DIR}) set(CMAKE_FIND_ROOT_PATH ${ROOTFS_DIR}) -set(CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} --sysroot=${ROOTFS_DIR}" - CACHE INTERNAL "" FORCE) -set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} --sysroot=${ROOTFS_DIR}" - CACHE INTERNAL "" FORCE) # search for programs in the build host directories set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) diff --git a/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-tizen.cmake b/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-tizen.cmake index 72513cdc1..181415df2 100644 --- a/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-tizen.cmake +++ b/infra/nnfw/cmake/buildtool/cross/toolchain_armv7l-tizen.cmake @@ -23,12 +23,6 @@ endif() set(CMAKE_SYSROOT ${ROOTFS_DIR}) set(CMAKE_FIND_ROOT_PATH ${ROOTFS_DIR}) -set(CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} --sysroot=${ROOTFS_DIR}" - CACHE INTERNAL "" FORCE) -set(CMAKE_EXE_LINKER_FLAGS - "${CMAKE_EXE_LINKER_FLAGS} --sysroot=${ROOTFS_DIR}" - CACHE INTERNAL "" FORCE) # search for programs in the build host directories set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) @@ -46,10 +40,6 @@ add_compile_options(-mfpu=neon-vfpv4) add_compile_options(-mfloat-abi=softfp) add_compile_options(--sysroot=${ROOTFS_DIR}) -set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --sysroot=${ROOTFS_DIR}") - -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --sysroot=${ROOTFS_DIR}") - include_directories(SYSTEM ${ROOTFS_DIR}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) include_directories(SYSTEM ${ROOTFS_DIR}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) add_compile_options(-Wno-deprecated-declarations) # compile-time option |