Fixed Haiku static build with PIC enabled

WohlSoft · Feb 13, 2024 · bc5081f · bc5081f
1 parent 879f397
commit bc5081f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/cmake/modules/DetectArchitecture.cmake b/cmake/modules/DetectArchitecture.cmake
@@ -11,6 +11,7 @@ macro(detect_architecture variable)
     ${CMAKE_BINARY_DIR}
     ${__check_architecture_size_dir}/DetectArchitecture.c
     OUTPUT_VARIABLE OUTPUT
+    CMAKE_FLAGS -DCMAKE_POSITION_INDEPENDENT_CODE=OFF
     COPY_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/DetectArchitecture.bin)
 
   if(HAVE_${variable})

diff --git a/cmake/modules/DetectFPUApi.cmake b/cmake/modules/DetectFPUApi.cmake
@@ -12,6 +12,7 @@ macro(detect_fpu_mode variable)
     ${CMAKE_BINARY_DIR}
     ${__check_fpu_mode_dir}/DetectFpuAbi.c
     OUTPUT_VARIABLE OUTPUT
+    CMAKE_FLAGS -DCMAKE_POSITION_INDEPENDENT_CODE=OFF
     COPY_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/DetectFpuAbi.bin)
 
   if(HAVE_${variable})
@@ -42,6 +43,7 @@ macro(detect_fpu_abi variable)
     ${CMAKE_BINARY_DIR}
     ${__check_fpu_mode_dir}/DetectFpuAbi.c
     OUTPUT_VARIABLE OUTPUT
+    CMAKE_FLAGS -DCMAKE_POSITION_INDEPENDENT_CODE=OFF
     COPY_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/DetectFpuAbi.bin)
 
   if(HAVE_${variable})

diff --git a/src/host/cmake/buildvm/CMakeLists.txt b/src/host/cmake/buildvm/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0...3.5)
 
 project(buildvm)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
+
 set(EXTRA_COMPILER_FLAGS_FILE "" CACHE PATH "Location of a file to specify extra compiler flags." )
 set(EXTRA_COMPILER_FLAGS "")
 if (EXISTS ${EXTRA_COMPILER_FLAGS_FILE})

diff --git a/src/host/cmake/minilua/CMakeLists.txt b/src/host/cmake/minilua/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0...3.5)
 
 project(minilua)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
+
 find_library(LIBM_LIBRARIES NAMES m)
 
 add_executable(minilua ../../minilua.c)