authorgravatar for ryan@zinascii.comRyan Zezeski <ryan@zinascii.com> 2023-09-26 15:52:35-06:00
committergravatar for ryan@zinascii.comRyan Zezeski <ryan@zinascii.com> 2023-09-30 11:38:56-06:00
logea92789c62869b49a9b884adcfb24f44ad626f7c
tree49976d17265fd1ae4a119056529fa1e72b3c5fde
parentf0724229d6e39931e0cd6aad1b060608a2879fc3

solaris: ld does not have stack-size option

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

CMakeLists.txt+4-1
...@@ -758,6 +758,9 @@ else()...@@ -758,6 +758,9 @@ else()
758 set(ZIG2_LINK_FLAGS "-Wl,-stack_size,0x10000000")758 set(ZIG2_LINK_FLAGS "-Wl,-stack_size,0x10000000")
759 elseif(MINGW)759 elseif(MINGW)
760 set(ZIG2_LINK_FLAGS "-Wl,--stack,0x10000000")760 set(ZIG2_LINK_FLAGS "-Wl,--stack,0x10000000")
761 # Solaris/illumos ld(1) does not provide a --stack-size option.
762 elseif(CMAKE_HOST_SOLARIS)
763 unset(ZIG2_LINK_FLAGS)
761 else()764 else()
762 set(ZIG2_LINK_FLAGS "-Wl,-z,stack-size=0x10000000")765 set(ZIG2_LINK_FLAGS "-Wl,-z,stack-size=0x10000000")
763 endif()766 endif()
...@@ -830,7 +833,7 @@ add_custom_command(...@@ -830,7 +833,7 @@ add_custom_command(
830add_executable(zig2 ${ZIG2_C_SOURCE} ${ZIG_COMPILER_RT_C_SOURCE})833add_executable(zig2 ${ZIG2_C_SOURCE} ${ZIG_COMPILER_RT_C_SOURCE})
831set_target_properties(zig2 PROPERTIES834set_target_properties(zig2 PROPERTIES
832 COMPILE_FLAGS ${ZIG2_COMPILE_FLAGS}835 COMPILE_FLAGS ${ZIG2_COMPILE_FLAGS}
833 LINK_FLAGS ${ZIG2_LINK_FLAGS}836 LINK_FLAGS "${ZIG2_LINK_FLAGS}"
834)837)
835target_include_directories(zig2 PUBLIC "${CMAKE_SOURCE_DIR}/stage1")838target_include_directories(zig2 PUBLIC "${CMAKE_SOURCE_DIR}/stage1")
836target_link_libraries(zig2 LINK_PUBLIC zigcpp)839target_link_libraries(zig2 LINK_PUBLIC zigcpp)