Commit 8eaf2ff207242bdac5092b262079543274a72f75 | zig

author	Michael Dusan <michael.dusan@gmail.com> 2023-04-29 13:14:51-04:00
committer	Michael Dusan <michael.dusan@gmail.com> 2023-05-16 16:45:10-04:00
log	8eaf2ff207242bdac5092b262079543274a72f75
tree	0c44f58ebacd1c2ee3430904ecfba5469fa9219e
parent	247b35360900367c3678f2d8a6dd0d0693f17072

- add pkg-maintainer-friendly option to enable PIE when building zig
- fix `ZIG_PIE_ARG` syntax

1 files changed, 11 insertions(+), 4 deletions(-)

CMakeLists.txt+11-4

 @@ -120,6 +120,8 @@ if(ZIG_AR_WORKAROUND)
   string(REPLACE "<CMAKE_AR>" "<CMAKE_AR> ar" CMAKE_CXX_ARCHIVE_CREATE ${CMAKE_CXX_ARCHIVE_CREATE})
 endif()
+set(ZIG_PIE off CACHE BOOL "produce a position independent zig executable")
 find_package(llvm 16)
 find_package(clang 16)
 find_package(lld 16)
 @@ -671,7 +673,12 @@ if(ZIG_STATIC)
 endif()
 add_library(zigcpp STATIC ${ZIG_CPP_SOURCES})
-set_target_properties(zigcpp PROPERTIES COMPILE_FLAGS ${EXE_CXX_FLAGS})
+if(ZIG_PIE)
+    set(ZIGCPP_CXX_FLAGS "${EXE_CXX_FLAGS} -fPIC")
+else()
+    set(ZIGCPP_CXX_FLAGS "${EXE_CXX_FLAGS}")
+endif()
+set_target_properties(zigcpp PROPERTIES COMPILE_FLAGS ${ZIGCPP_CXX_FLAGS})
 target_link_libraries(zigcpp LINK_PUBLIC
     ${CLANG_LIBRARIES}
 @@ -823,10 +830,10 @@ else()
   set(ZIG_STATIC_ARG "")
 endif()
-if(CMAKE_POSITION_INDEPENDENT_CODE)
+if(CMAKE_POSITION_INDEPENDENT_CODE OR ZIG_PIE)
-  set(ZIG_PIE_ARG="-Dpie")
+  set(ZIG_PIE_ARG "-Dpie")
 else()
-  set(ZIG_PIE_ARG="")
+  set(ZIG_PIE_ARG "")
 endif()
 set(ZIG_BUILD_ARGS