From: John Crispin Date: Thu, 19 Jun 2014 11:16:08 +0000 (+0100) Subject: make static linking work for upgraded X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fprocd.git;a=commitdiff_plain;h=8e12022c3d00f8acca4471016d71794988113c34 make static linking work for upgraded Signed-off-by: John Crispin --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 1616b72..dc7ecd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,9 +21,7 @@ IF(DEBUG) ADD_DEFINITIONS(-DDEBUG -g3) ENDIF() -IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips") add_subdirectory(upgraded) -ENDIF() ADD_EXECUTABLE(procd ${SOURCES}) TARGET_LINK_LIBRARIES(procd ${LIBS}) diff --git a/upgraded/CMakeLists.txt b/upgraded/CMakeLists.txt index 7e08c0e..093dba2 100644 --- a/upgraded/CMakeLists.txt +++ b/upgraded/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) PROJECT(upgraded C) ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations) -set(CMAKE_EXE_LINKER_FLAGS -static) +set(CMAKE_EXE_LINKER_FLAGS "-static -fPIC") set(CMAKE_FIND_LIBRARY_SUFFIXES .a) set(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS) set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS) @@ -11,7 +11,7 @@ set(CMAKE_SHARED_LIBRARY_CXX_FLAGS) set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS) set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS) ADD_EXECUTABLE(upgraded upgraded.c ../watchdog.c) -TARGET_LINK_LIBRARIES(upgraded ubox rt) +TARGET_LINK_LIBRARIES(upgraded ubox rt -lc -lgcc_pic) INSTALL(TARGETS upgraded RUNTIME DESTINATION sbin ) diff --git a/upgraded/upgraded b/upgraded/upgraded deleted file mode 100755 index a78470c..0000000 Binary files a/upgraded/upgraded and /dev/null differ