overby.me / darling-nix
this repo has no description
1
fork

Configure Feed

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

Resolved config.h conflicts, simplified dylib searching

Lubos Dolezel 793a795e eccccba5

+15 -6
+2
etc/dylib.conf
··· 1 1 [aliases] 2 + /usr/lib/libSystem.B.dylib=libSystem.B.dylib.so 3 + /usr/lib/libobjc.A.dylib=libobjc.A.dylib.so 2 4 libintl.8.dylib=libSystem.B.dylib.so 3 5 libiconv.2.dylib=libSystem.B.dylib.so 4 6 libstdc++.6.dylib=libSystem.B.dylib.so
+1 -1
src/CoreSecurity/CMakeLists.txt
··· 26 26 add_library(CoreSecurity SHARED ${cs_SRCS}) 27 27 target_link_libraries(CoreSecurity) 28 28 29 - install(TARGETS CoreSecurity DESTINATION "lib${SUFFIX}") 29 + install(TARGETS CoreSecurity DESTINATION "lib${SUFFIX}/darling") 30 30
+7 -1
src/dyld/ld.cpp
··· 124 124 flag = translateFlags(flag); 125 125 126 126 std::string path; 127 + #if 0 127 128 start_search: 128 129 if (*filename == '/') 129 130 { ··· 223 224 } 224 225 } 225 226 } 226 - else if (strncmp(filename, "@executable_path", 16) == 0) 227 + else 228 + #endif 229 + if (strncmp(filename, "@executable_path", 16) == 0) 227 230 { 228 231 path = replacePathPrefix("@executable_path", filename, g_darwin_executable_path); 229 232 std::cout << "Full path: " << path << std::endl; ··· 256 259 RET_IF( attemptDlopen(path.c_str(), flag) ); 257 260 } 258 261 } 262 + 263 + if (strncmp(filename, "/usr/lib/", 9) == 0) 264 + filename = filename + 9; 259 265 260 266 for (int i = 0; i < sizeof(g_searchPath) / sizeof(g_searchPath[0]); i++) 261 267 {
+1 -1
src/libSystem/CMakeLists.txt
··· 95 95 target_link_libraries(System.B.dylib -ldl -lpthread -luuid -l:../../libmach-o.so -lrt -lssl -lbsd -l:libobjc.so.4) 96 96 add_dependencies(System.B.dylib mach-o) 97 97 98 - install(TARGETS System.B.dylib DESTINATION "lib${SUFFIX}") 98 + install(TARGETS System.B.dylib DESTINATION "lib${SUFFIX}/darling") 99 99
+3 -2
src/libobjcdarwin/CMakeLists.txt
··· 16 16 message(STATUS "Building ObjC ABI 2") 17 17 endif(BITS EQUAL 64) 18 18 19 - configure_file(config.h.in config.h) 19 + configure_file(config.h.in objc_config.h) 20 + include_directories(${CMAKE_CURRENT_BINARY_DIR}) 20 21 21 22 add_definitions(-D__STDC_LIMIT_MACROS) 22 23 ··· 70 71 add_library(objc.A.dylib SHARED ${objcdarwin_SRCS}) 71 72 target_link_libraries(objc.A.dylib -l:libobjc.so.4 -lgnustep-base -l:../../libutil.a) 72 73 73 - install(TARGETS objc.A.dylib DESTINATION "lib${SUFFIX}") 74 + install(TARGETS objc.A.dylib DESTINATION "lib${SUFFIX}/darling") 74 75
+1 -1
src/libobjcdarwin/ClassRegister.cpp
··· 1 - #include "config.h" 1 + #include "objc_config.h" 2 2 #include "ClassRegister.h" 3 3 #include "../dyld/public.h" 4 4 #include "../util/trace.h"