authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-06-17 14:22:43-07:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2023-06-17 14:22:43-07:00
loge23d48e61a594cabb735accf4c0a18dab6ae18a2
treebf57a58defec4d420d4cc3c33c4a0443d0c4dc6a
parente3736baddb8ecff90f0594be9f604c7484ce9aa2
parent8eaf2ff207242bdac5092b262079543274a72f75
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #15511 from mikdusan/netbsd-pkgsrc

netbsd: pkgsrc

2 files changed, 13 insertions(+), 6 deletions(-)

CMakeLists.txt+11-4
......@@ -120,6 +120,8 @@ if(ZIG_AR_WORKAROUND)
120120 string(REPLACE "<CMAKE_AR>" "<CMAKE_AR> ar" CMAKE_CXX_ARCHIVE_CREATE ${CMAKE_CXX_ARCHIVE_CREATE})
121121endif()
122122
123set(ZIG_PIE off CACHE BOOL "produce a position independent zig executable")
124
123125find_package(llvm 16)
124126find_package(clang 16)
125127find_package(lld 16)
......@@ -671,7 +673,12 @@ if(ZIG_STATIC)
671673endif()
672674
673675add_library(zigcpp STATIC ${ZIG_CPP_SOURCES})
674set_target_properties(zigcpp PROPERTIES COMPILE_FLAGS ${EXE_CXX_FLAGS})
676if(ZIG_PIE)
677 set(ZIGCPP_CXX_FLAGS "${EXE_CXX_FLAGS} -fPIC")
678else()
679 set(ZIGCPP_CXX_FLAGS "${EXE_CXX_FLAGS}")
680endif()
681set_target_properties(zigcpp PROPERTIES COMPILE_FLAGS ${ZIGCPP_CXX_FLAGS})
675682
676683target_link_libraries(zigcpp LINK_PUBLIC
677684 ${CLANG_LIBRARIES}
......@@ -823,10 +830,10 @@ else()
823830 set(ZIG_STATIC_ARG "")
824831endif()
825832
826if(CMAKE_POSITION_INDEPENDENT_CODE)
827 set(ZIG_PIE_ARG="-Dpie")
833if(CMAKE_POSITION_INDEPENDENT_CODE OR ZIG_PIE)
834 set(ZIG_PIE_ARG "-Dpie")
828835else()
829 set(ZIG_PIE_ARG="")
836 set(ZIG_PIE_ARG "")
830837endif()
831838
832839set(ZIG_BUILD_ARGS
src/link/Elf.zig+2-2
......@@ -1667,10 +1667,10 @@ fn linkWithLLD(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node) !v
16671667 try argv.append("-pie");
16681668 }
16691669
1670 if (self.base.options.link_mode == .Dynamic and target.os.tag == .netbsd) {
1670 if (is_dyn_lib and target.os.tag == .netbsd) {
16711671 // Add options to produce shared objects with only 2 PT_LOAD segments.
16721672 // NetBSD expects 2 PT_LOAD segments in a shared object, otherwise
1673 // ld.elf_so fails to load, emitting a general "not found" error.
1673 // ld.elf_so fails loading dynamic libraries with "not found" error.
16741674 // See https://github.com/ziglang/zig/issues/9109 .
16751675 try argv.append("--no-rosegment");
16761676 try argv.append("-znorelro");