this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix Building For 64bit Only

There might be more CMakeLists that need to be fixed, but for now, Darling seems to build fine with the following changes made.

Thomas A 15b57387 8fdd5403

+19 -10
+19 -10
src/libelfloader/native/CMakeLists.txt
··· 5 5 threads.c 6 6 ) 7 7 8 - add_executable(elfloader_dummy64 ${elfstub_sources}) 9 - target_link_libraries(elfloader_dummy64 -lpthread -lrt -ldl) 10 - set_target_properties(elfloader_dummy64 PROPERTIES COMPILE_FLAGS "-fPIC" 11 - LINK_FLAGS "-pie -fPIC") 8 + if (BUILD_TARGET_64BIT) 9 + add_executable(elfloader_dummy64 ${elfstub_sources}) 10 + target_link_libraries(elfloader_dummy64 -lpthread -lrt -ldl) 11 + set_target_properties(elfloader_dummy64 PROPERTIES COMPILE_FLAGS "-fPIC" 12 + LINK_FLAGS "-pie -fPIC") 13 + endif () 12 14 13 - add_executable(elfloader_dummy32 ${elfstub_sources}) 14 - target_link_libraries(elfloader_dummy32 -lpthread -lrt -ldl) 15 - set_target_properties(elfloader_dummy32 PROPERTIES COMPILE_FLAGS "-fPIC -m32" 16 - LINK_FLAGS "-pie -fPIC -m32") 17 - 18 - install(TARGETS elfloader_dummy32 elfloader_dummy64 DESTINATION libexec/darling/usr/libexec) 15 + if (BUILD_TARGET_32BIT) 16 + add_executable(elfloader_dummy32 ${elfstub_sources}) 17 + target_link_libraries(elfloader_dummy32 -lpthread -lrt -ldl) 18 + set_target_properties(elfloader_dummy32 PROPERTIES COMPILE_FLAGS "-fPIC -m32" 19 + LINK_FLAGS "-pie -fPIC -m32") 20 + endif () 19 21 22 + if (BUILD_TARGET_64BIT AND BUILD_TARGET_32BIT) 23 + install(TARGETS elfloader_dummy32 elfloader_dummy64 DESTINATION libexec/darling/usr/libexec) 24 + elseif (BUILD_TARGET_64BIT) 25 + install(TARGETS elfloader_dummy64 DESTINATION libexec/darling/usr/libexec) 26 + elseif (BUILD_TARGET_32BIT) 27 + install(TARGETS elfloader_dummy32 DESTINATION libexec/darling/usr/libexec) 28 + endif ()