this repo has no description
Allow i386 or x86_64 only builds
Currently x86_64 or i386 only builds fail to enter shell.
CMake generation flags:
Build x86_64 only: -DTARGET_i386=OFF
Build i386 only: -DTARGET_x86_64=OFF
The default is still to build FAT binaries for both.
+380
-206
+2
CMakeLists.txt
+2
CMakeLists.txt
···
58
58
option(FRAMEWORK_COREAUDIO "Enable audio-related functionality" OFF)
59
59
option(FRAMEWORK_APPKIT "Enable AppKit development code" OFF)
60
60
option(FULL_BUILD "Include large items in the build" ON)
61
+
option(TARGET_i386 "Enable i386 slices" ON)
62
+
option(TARGET_x86_64 "Enable x86_64 slices" ON)
61
63
62
64
FindDsymutil()
63
65
+9
cmake/darling_exe.cmake
+9
cmake/darling_exe.cmake
···
13
13
add_executable(${exe} ${files})
14
14
set_property(TARGET ${exe} APPEND_STRING PROPERTY
15
15
LINK_FLAGS " ${CMAKE_EXE_LINKER_FLAGS} -nostdlib ${CMAKE_BINARY_DIR}/src/csu/CMakeFiles/csu.dir/crt1.10.6.o ")
16
+
17
+
if (TARGET_x86_64)
18
+
target_compile_options(${exe} PRIVATE -arch x86_64)
19
+
elseif (TARGET_i386)
20
+
target_compile_options(${exe} PRIVATE -arch i386)
21
+
set_property(TARGET ${exe} APPEND_STRING PROPERTY
22
+
LINK_FLAGS " -arch i386")
23
+
endif (TARGET_x86_64)
24
+
16
25
use_ld64(${exe})
17
26
target_link_libraries(${exe} system)
18
27
add_dependencies(${exe} csu)
+99
-48
cmake/darling_framework.cmake
+99
-48
cmake/darling_framework.cmake
···
111
111
112
112
set(DYLIB_INSTALL_NAME "/System/Library/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/${name}")
113
113
114
+
if (TARGET_i386)
115
+
set(DARLING_LIB_i386_ONLY TRUE)
116
+
add_darling_library(${my_name}_i386 ${FRAMEWORK_SOURCES})
117
+
set(DARLING_LIB_i386_ONLY FALSE)
118
+
set_target_properties(${my_name}_i386 PROPERTIES
119
+
OUTPUT_NAME "${name}_i386"
120
+
SUFFIX ""
121
+
PREFIX "")
122
+
set_property(TARGET ${my_name}_i386 APPEND_STRING PROPERTY
123
+
COMPILE_FLAGS " -arch i386")
124
+
set_property(TARGET ${my_name}_i386 APPEND_STRING PROPERTY
125
+
LINK_FLAGS " -arch i386")
126
+
if (NOT FRAMEWORK_CURRENT_VERSION)
127
+
add_library("${my_name}_i386" ALIAS "${name}_i386")
128
+
endif (NOT FRAMEWORK_CURRENT_VERSION)
114
129
115
-
add_darling_library(${my_name}_i386 SHARED ${FRAMEWORK_SOURCES})
116
-
add_darling_library(${my_name}_x86_64 SHARED ${FRAMEWORK_SOURCES})
130
+
if (FRAMEWORK_DEPENDENCIES)
131
+
target_link_libraries(${my_name}_i386 PRIVATE ${FRAMEWORK_DEPENDENCIES})
132
+
endif (FRAMEWORK_DEPENDENCIES)
117
133
118
-
set_target_properties(${my_name}_i386 PROPERTIES
119
-
OUTPUT_NAME "${name}_i386"
120
-
SUFFIX ""
121
-
PREFIX "")
122
-
set_target_properties(${my_name}_x86_64 PROPERTIES
123
-
OUTPUT_NAME "${name}_x86_64"
124
-
SUFFIX ""
125
-
PREFIX "")
126
-
set_property(TARGET ${my_name}_i386 APPEND_STRING PROPERTY
127
-
COMPILE_FLAGS " -arch i386")
128
-
set_property(TARGET ${my_name}_x86_64 APPEND_STRING PROPERTY
129
-
COMPILE_FLAGS " -arch x86_64")
130
-
set_property(TARGET ${my_name}_i386 APPEND_STRING PROPERTY
131
-
LINK_FLAGS " -arch i386")
132
-
set_property(TARGET ${my_name}_x86_64 APPEND_STRING PROPERTY
133
-
LINK_FLAGS " -arch x86_64")
134
+
if (FRAMEWORK_LINK_FLAGS)
135
+
set_property(TARGET ${my_name}_i386 APPEND_STRING PROPERTY LINK_FLAGS " ${FRAMEWORK_LINK_FLAGS}")
136
+
endif (FRAMEWORK_LINK_FLAGS)
137
+
endif (TARGET_i386)
138
+
139
+
if (TARGET_x86_64)
140
+
set(DARLING_LIB_x86_64_ONLY TRUE)
141
+
add_darling_library(${my_name}_x86_64 ${FRAMEWORK_SOURCES})
142
+
set(DARLING_LIB_x86_64_ONLY FALSE)
143
+
set_target_properties(${my_name}_x86_64 PROPERTIES
144
+
OUTPUT_NAME "${name}_x86_64"
145
+
SUFFIX ""
146
+
PREFIX "")
147
+
set_property(TARGET ${my_name}_x86_64 APPEND_STRING PROPERTY
148
+
COMPILE_FLAGS " -arch x86_64")
149
+
set_property(TARGET ${my_name}_x86_64 APPEND_STRING PROPERTY
150
+
LINK_FLAGS " -arch x86_64")
151
+
if (NOT FRAMEWORK_CURRENT_VERSION)
152
+
add_library("${my_name}_x86_64" ALIAS "${name}_x86_64")
153
+
endif (NOT FRAMEWORK_CURRENT_VERSION)
134
154
135
-
if (NOT FRAMEWORK_CURRENT_VERSION)
136
-
add_library("${my_name}_i386" ALIAS "${name}_i386")
137
-
add_library("${my_name}_x86_64" ALIAS "${name}_x86_64")
138
-
endif (NOT FRAMEWORK_CURRENT_VERSION)
155
+
if (FRAMEWORK_DEPENDENCIES)
156
+
target_link_libraries(${my_name}_x86_64 PRIVATE ${FRAMEWORK_DEPENDENCIES})
157
+
endif (FRAMEWORK_DEPENDENCIES)
139
158
140
-
if (FRAMEWORK_DEPENDENCIES)
141
-
target_link_libraries(${my_name}_i386 PRIVATE ${FRAMEWORK_DEPENDENCIES})
142
-
target_link_libraries(${my_name}_x86_64 PRIVATE ${FRAMEWORK_DEPENDENCIES})
143
-
endif (FRAMEWORK_DEPENDENCIES)
159
+
if (FRAMEWORK_LINK_FLAGS)
160
+
set_property(TARGET ${my_name}_x86_64 APPEND_STRING PROPERTY LINK_FLAGS " ${FRAMEWORK_LINK_FLAGS}")
161
+
endif (FRAMEWORK_LINK_FLAGS)
162
+
endif (TARGET_x86_64)
144
163
145
-
if (FRAMEWORK_LINK_FLAGS)
146
-
set_property(TARGET ${my_name}_i386 APPEND_STRING PROPERTY LINK_FLAGS " ${FRAMEWORK_LINK_FLAGS}")
147
-
set_property(TARGET ${my_name}_x86_64 APPEND_STRING PROPERTY LINK_FLAGS " ${FRAMEWORK_LINK_FLAGS}")
148
-
endif (FRAMEWORK_LINK_FLAGS)
164
+
if (TARGET_i386 AND TARGET_x86_64)
165
+
add_dependencies(${my_name}_x86_64 ${my_name}_i386)
166
+
add_custom_command(TARGET ${my_name}_x86_64 POST_BUILD
167
+
COMMAND ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/lipo
168
+
-arch i386 $<TARGET_FILE:${my_name}_i386>
169
+
-arch x86_64 $<TARGET_FILE:${my_name}_x86_64>
170
+
-create
171
+
-output
172
+
${CMAKE_CURRENT_BINARY_DIR}/${my_name}
173
+
COMMENT "Running lipo to create ${my_name}"
174
+
BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${my_name}
175
+
)
176
+
add_library(${my_name} SHARED IMPORTED GLOBAL)
177
+
set_target_properties(${my_name} PROPERTIES
178
+
SUFFIX ""
179
+
PREFIX ""
180
+
IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${my_name}
181
+
)
182
+
add_dependencies(${my_name} ${my_name}_x86_64)
183
+
elseif (TARGET_i386)
149
184
150
-
add_dependencies(${my_name}_x86_64 ${my_name}_i386)
151
-
add_custom_command(TARGET ${my_name}_x86_64 POST_BUILD
152
-
COMMAND ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/lipo
153
-
-arch i386 $<TARGET_FILE:${my_name}_i386>
154
-
-arch x86_64 $<TARGET_FILE:${my_name}_x86_64>
155
-
-create
156
-
-output
157
-
${CMAKE_CURRENT_BINARY_DIR}/${my_name}
158
-
COMMENT "Running lipo to create ${my_name}"
159
-
BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${my_name}
160
-
)
161
-
add_library(${my_name} SHARED IMPORTED GLOBAL)
162
-
set_target_properties(${my_name} PROPERTIES
163
-
SUFFIX ""
164
-
PREFIX ""
165
-
IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${my_name}
166
-
)
167
-
add_dependencies(${my_name} ${my_name}_x86_64)
185
+
add_custom_command(TARGET ${my_name}_i386 POST_BUILD
186
+
COMMAND ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/lipo
187
+
-arch i386 $<TARGET_FILE:${my_name}_i386>
188
+
-create
189
+
-output
190
+
${CMAKE_CURRENT_BINARY_DIR}/${my_name}
191
+
COMMENT "Running lipo to create ${my_name}"
192
+
BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${my_name}
193
+
)
194
+
add_library(${my_name} SHARED IMPORTED GLOBAL)
195
+
set_target_properties(${my_name} PROPERTIES
196
+
SUFFIX ""
197
+
PREFIX ""
198
+
IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${my_name}
199
+
)
200
+
add_dependencies(${my_name} ${my_name}_i386)
201
+
elseif (TARGET_x86_64)
202
+
add_custom_command(TARGET ${my_name}_x86_64 POST_BUILD
203
+
COMMAND ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/lipo
204
+
-arch x86_64 $<TARGET_FILE:${my_name}_x86_64>
205
+
-create
206
+
-output
207
+
${CMAKE_CURRENT_BINARY_DIR}/${my_name}
208
+
COMMENT "Running lipo to create ${my_name}"
209
+
BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${my_name}
210
+
)
211
+
add_library(${my_name} SHARED IMPORTED GLOBAL)
212
+
set_target_properties(${my_name} PROPERTIES
213
+
SUFFIX ""
214
+
PREFIX ""
215
+
IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${my_name}
216
+
)
217
+
add_dependencies(${my_name} ${my_name}_x86_64)
218
+
endif (TARGET_i386 AND TARGET_x86_64)
168
219
169
220
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${my_name} DESTINATION "libexec/darling/System/Library/${dir_name}/${name}.framework/Versions/${FRAMEWORK_VERSION}/")
170
221
+55
-7
cmake/darling_lib.cmake
+55
-7
cmake/darling_lib.cmake
···
41
41
LINK_FLAGS " -Wl,-current_version,${DYLIB_CURRENT_VERSION} ")
42
42
endif (DYLIB_CURRENT_VERSION)
43
43
44
+
set_property(TARGET ${name} APPEND_STRING PROPERTY COMPILE_FLAGS " -B ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/")
45
+
add_dependencies(${name} lipo)
46
+
47
+
if (TARGET_x86_64 AND NOT DARLING_LIB_i386_ONLY)
48
+
set_property(TARGET ${name} APPEND_STRING PROPERTY COMPILE_FLAGS " -arch x86_64")
49
+
set_property(TARGET ${name} APPEND_STRING PROPERTY LINK_FLAGS " -arch x86_64")
50
+
endif (TARGET_x86_64 AND NOT DARLING_LIB_i386_ONLY)
51
+
if (TARGET_i386 AND NOT DARLING_LIB_x86_64_ONLY)
52
+
set_property(TARGET ${name} APPEND_STRING PROPERTY COMPILE_FLAGS " -arch i386")
53
+
set_property(TARGET ${name} APPEND_STRING PROPERTY LINK_FLAGS " -arch i386")
54
+
endif (TARGET_i386 AND NOT DARLING_LIB_x86_64_ONLY)
55
+
44
56
use_ld64(${name})
45
57
46
58
if (NOT NO_DSYM)
···
49
61
ENDFUNCTION(add_darling_library)
50
62
51
63
FUNCTION(make_fat)
52
-
set_property(TARGET ${ARGV} APPEND_STRING PROPERTY
53
-
LINK_FLAGS " -arch i386 -arch x86_64")
54
-
set_property(TARGET ${ARGV} APPEND_STRING PROPERTY
55
-
COMPILE_FLAGS " -B ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ -arch i386 -arch x86_64")
56
-
foreach(tgt ${ARGV})
57
-
add_dependencies(${tgt} lipo)
58
-
endforeach(tgt)
64
+
if (TARGET_i386 AND TARGET_x86_64)
65
+
set_property(TARGET ${ARGV} APPEND_STRING PROPERTY
66
+
COMPILE_FLAGS " -B ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ -arch i386 -arch x86_64")
67
+
set_property(TARGET ${ARGV} APPEND_STRING PROPERTY
68
+
LINK_FLAGS " -arch i386 -arch x86_64")
69
+
foreach(tgt ${ARGV})
70
+
add_dependencies(${tgt} lipo)
71
+
endforeach(tgt)
72
+
elseif (TARGET_i386)
73
+
set_property(TARGET ${ARGV} APPEND_STRING PROPERTY
74
+
COMPILE_FLAGS " -B ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ -arch i386")
75
+
set_property(TARGET ${ARGV} APPEND_STRING PROPERTY
76
+
LINK_FLAGS " -arch i386")
77
+
foreach(tgt ${ARGV})
78
+
add_dependencies(${tgt} lipo)
79
+
endforeach(tgt)
80
+
elseif (TARGET_x86_64)
81
+
set_property(TARGET ${ARGV} APPEND_STRING PROPERTY
82
+
COMPILE_FLAGS " -B ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ -arch x86_64")
83
+
set_property(TARGET ${ARGV} APPEND_STRING PROPERTY
84
+
LINK_FLAGS " -arch x86_64")
85
+
foreach(tgt ${ARGV})
86
+
add_dependencies(${tgt} lipo)
87
+
endforeach(tgt)
88
+
endif (TARGET_i386 AND TARGET_x86_64)
59
89
ENDFUNCTION(make_fat)
60
90
61
91
# add_circular(name ...)
···
129
159
make_fat(${name})
130
160
endif (CIRCULAR_FAT)
131
161
ENDFUNCTION(add_circular)
162
+
163
+
function(add_darling_object_library name)
164
+
cmake_parse_arguments(OBJECT_LIB "i386_ONLY;x86_64_ONLY" "" "" ${ARGN})
165
+
foreach(f IN LISTS ARGN)
166
+
set(files ${files} ${f})
167
+
endforeach(f)
168
+
169
+
add_library(${name} OBJECT ${files})
170
+
add_dependencies(${name} lipo)
171
+
set_property(TARGET ${name} APPEND_STRING PROPERTY COMPILE_FLAGS " -B ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/")
172
+
173
+
if (TARGET_i386 AND NOT OBJECT_LIB_x86_64_ONLY)
174
+
set_property(TARGET ${name} APPEND_STRING PROPERTY COMPILE_FLAGS " -arch i386")
175
+
endif (TARGET_i386 AND NOT OBJECT_LIB_x86_64_ONLY)
176
+
if (TARGET_x86_64 AND NOT OBJECT_LIB_i386_ONLY)
177
+
set_property(TARGET ${name} APPEND_STRING PROPERTY COMPILE_FLAGS " -arch x86_64")
178
+
endif (TARGET_x86_64 AND NOT OBJECT_LIB_i386_ONLY)
179
+
endfunction(add_darling_object_library)
+14
cmake/darling_static_lib.cmake
+14
cmake/darling_static_lib.cmake
···
10
10
set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib")
11
11
add_library(${name} STATIC ${STATIC_LIB_SOURCES})
12
12
13
+
set_property(TARGET ${name} APPEND_STRING PROPERTY COMPILE_FLAGS " -B ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/")
14
+
set_property(TARGET ${name} APPEND_STRING PROPERTY LINK_FLAGS " -B ${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/")
15
+
add_dependencies(${name} lipo)
16
+
17
+
if (TARGET_x86_64)
18
+
set_property(TARGET ${name} APPEND_STRING PROPERTY
19
+
COMPILE_FLAGS " -arch x86_64")
20
+
endif (TARGET_x86_64)
21
+
22
+
if (TARGET_i386)
23
+
set_property(TARGET ${name} APPEND_STRING PROPERTY
24
+
COMPILE_FLAGS " -arch i386")
25
+
endif (TARGET_i386)
26
+
13
27
if (STATIC_LIB_FAT)
14
28
make_fat(${name})
15
29
endif (STATIC_LIB_FAT)
+2
src/AppleSystemInfo/src/functions.c
+2
src/AppleSystemInfo/src/functions.c
+1
-1
src/CMakeLists.txt
+1
-1
src/CMakeLists.txt
+2
src/DiskImages/functions.c
+2
src/DiskImages/functions.c
+2
src/Metal/src/functions.c
+2
src/Metal/src/functions.c
+2
src/PackageKit/functions.c
+2
src/PackageKit/functions.c
+11
-3
src/dyld/CMakeLists.txt
+11
-3
src/dyld/CMakeLists.txt
···
87
87
set_target_properties(system_loader PROPERTIES OUTPUT_NAME "dyld")
88
88
set_property(TARGET system_loader APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-dylinker -Wl,-dead_strip -nostdlib -Wl,-e,__dyld_start -Wl,-image_base,0x1fe00000")
89
89
target_link_libraries(system_loader libc_static system_blocks_static
90
-
libc_static32 libc_static64 cxx_static
90
+
cxx_static
91
91
unwind_static system_kernel_static system_m_static cxxabi_static
92
-
keymgr_static compiler_rt_static32 compiler_rt_static64 system_duct_static
93
-
platform_static32 platform_static64 pthread_static macho_static)
92
+
keymgr_static system_duct_static
93
+
pthread_static macho_static)
94
+
95
+
if (TARGET_i386)
96
+
target_link_libraries(system_loader libc_static32 compiler_rt_static32 platform_static32)
97
+
endif (TARGET_i386)
98
+
99
+
if (TARGET_x86_64)
100
+
target_link_libraries(system_loader libc_static64 compiler_rt_static64 platform_static64)
101
+
endif (TARGET_x86_64)
94
102
95
103
make_fat(system_loader)
96
104
+2
-2
src/kernel/emulation/linux/CMakeLists.txt
+2
-2
src/kernel/emulation/linux/CMakeLists.txt
···
306
306
set_source_files_properties(misc/sysctl.c PROPERTIES COMPILE_FLAGS
307
307
"-I${DARLING_TOP_DIRECTORY}/platform-include -I${DARLING_TOP_DIRECTORY}/kernel-include")
308
308
309
-
add_library(emulation OBJECT ${emulation_sources})
310
-
add_library(emulation_dyld OBJECT ${emulation_sources})
309
+
add_darling_object_library(emulation ${emulation_sources})
310
+
add_darling_object_library(emulation_dyld ${emulation_sources})
311
311
set_target_properties(emulation_dyld PROPERTIES COMPILE_FLAGS "-ffunction-sections -DVARIANT_DYLD")
312
312
add_dependencies(emulation rtsig_h)
313
313
+2
-2
src/kernel/emulation/linux/mach/CMakeLists.txt
+2
-2
src/kernel/emulation/linux/mach/CMakeLists.txt
···
18
18
mach_table.c
19
19
)
20
20
21
-
add_library(mach_server_client OBJECT ${mach_server_client_sources})
22
-
add_library(mach_server_client_dyld OBJECT ${mach_server_client_sources})
21
+
add_darling_object_library(mach_server_client ${mach_server_client_sources})
22
+
add_darling_object_library(mach_server_client_dyld ${mach_server_client_sources})
23
23
set_target_properties(mach_server_client_dyld PROPERTIES COMPILE_FLAGS "-DVARIANT_DYLD")
24
24
make_fat(mach_server_client)
25
25
make_fat(mach_server_client_dyld)
+4
-4
src/kernel/libsyscall/CMakeLists.txt
+4
-4
src/kernel/libsyscall/CMakeLists.txt
···
617
617
set_source_files_properties(${file} PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -U_DARWIN_C_SOURCE -U_POSIX_C_SOURCE -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_C_LEVEL")
618
618
endforeach(file)
619
619
620
-
add_library(libsyscall OBJECT ${syscall_sources})
621
-
add_library(libsyscall_dynamic OBJECT ${syscall_dynamic_sources})
620
+
add_darling_object_library(libsyscall ${syscall_sources})
621
+
add_darling_object_library(libsyscall_dynamic ${syscall_dynamic_sources})
622
622
make_fat(libsyscall)
623
623
make_fat(libsyscall_dynamic)
624
624
625
-
#add_library(libsyscall_static OBJECT wrappers/_libc_funcptr.c)
625
+
#add_darling_object_library(libsyscall_static wrappers/_libc_funcptr.c)
626
626
#set_target_properties(libsyscall_static PROPERTIES COMPILE_FLAGS "-DVARIANT_DYLD")
627
627
#make_fat(libsyscall_static)
628
628
629
629
# For i386
630
-
#add_library(libsyscall_legacy_extra OBJECT wrappers/legacy/select.c)
630
+
#add_darling_object_library(libsyscall_legacy_extra wrappers/legacy/select.c)
631
631
#set_target_properties(libsyscall_legacy_extra PROPERTIES COMPILE_FLAGS
632
632
# "${CMAKE_C_FLAGS} -U_DARWIN_C_SOURCE -U_POSIX_C_SOURCE -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_C_LEVEL")
633
633
+43
-29
src/libc/CMakeLists.txt
+43
-29
src/libc/CMakeLists.txt
···
64
64
add_subdirectory(net)
65
65
add_subdirectory(locale)
66
66
add_subdirectory(darwin)
67
-
add_subdirectory(i386)
68
-
add_subdirectory(x86_64)
69
67
70
-
set_property (
71
-
TARGET
72
-
libc-stdio_legacy
73
-
libc-compat_legacy
74
-
libc-stdlib_legacy
75
-
libc-stdtime_legacy
76
-
libc-gen_legacy
77
-
libc-string_legacy
78
-
libc-gdtoa_legacy
79
-
libc-regex_legacy
80
-
libc-locale_legacy
81
-
libc-net_legacy
82
-
libc-i386
83
-
APPEND_STRING PROPERTY COMPILE_FLAGS
84
-
" -arch i386"
85
-
)
86
-
set_property (
87
-
TARGET
88
-
libc-x86_64
89
-
APPEND_STRING PROPERTY COMPILE_FLAGS
90
-
" -arch x86_64"
91
-
)
68
+
if (TARGET_i386)
69
+
add_subdirectory(i386)
70
+
set_property (
71
+
TARGET
72
+
libc-stdio_legacy
73
+
libc-compat_legacy
74
+
libc-stdlib_legacy
75
+
libc-stdtime_legacy
76
+
libc-gen_legacy
77
+
libc-string_legacy
78
+
libc-gdtoa_legacy
79
+
libc-regex_legacy
80
+
libc-locale_legacy
81
+
libc-net_legacy
82
+
libc-i386
83
+
APPEND_STRING PROPERTY COMPILE_FLAGS
84
+
" -arch i386"
85
+
)
86
+
else (TARGET_i386)
87
+
add_library(libc-stdio_legacy OBJECT empty.c)
88
+
add_library(libc-compat_legacy OBJECT empty.c)
89
+
add_library(libc-stdlib_legacy OBJECT empty.c)
90
+
add_library(libc-stdtime_legacy OBJECT empty.c)
91
+
add_library(libc-gen_legacy OBJECT empty.c)
92
+
add_library(libc-string_legacy OBJECT empty.c)
93
+
add_library(libc-gdtoa_legacy OBJECT empty.c)
94
+
add_library(libc-regex_legacy OBJECT empty.c)
95
+
add_library(libc-locale_legacy OBJECT empty.c)
96
+
add_library(libc-net_legacy OBJECT empty.c)
97
+
add_library(libc-i386 OBJECT empty.c)
98
+
endif (TARGET_i386)
92
99
93
-
#set_property (
94
-
# TARGET
100
+
if (TARGET_x86_64)
101
+
add_subdirectory(x86_64)
102
+
set_property (
103
+
TARGET
104
+
libc-x86_64
105
+
APPEND_STRING PROPERTY COMPILE_FLAGS
106
+
" -arch x86_64"
107
+
)
108
+
else (TARGET_x86_64)
109
+
add_library(libc-x86_64 OBJECT empty.c)
110
+
endif (TARGET_x86_64)
111
+
95
112
make_fat(
96
113
libc-db
97
114
libc-compat
···
129
146
libc-sys_dyld
130
147
libc-gdtoa_dyld
131
148
)
132
-
# APPEND_STRING PROPERTY COMPILE_FLAGS
133
-
# " -arch x86_64 -arch i386"
134
-
#)
135
149
136
150
set(DYLIB_INSTALL_NAME "/usr/lib/system/libsystem_c.dylib")
137
151
add_circular(system_c FAT OBJECTS
+8
-7
src/libc/compat-43/CMakeLists.txt
+8
-7
src/libc/compat-43/CMakeLists.txt
···
21
21
SET_SOURCE_FILES_PROPERTIES(FreeBSD/setpgrp.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_SETPGRP")
22
22
SET_SOURCE_FILES_PROPERTIES(sigcompat.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_SIGPAUSE")
23
23
24
-
add_library(libc-compat OBJECT ${compat_sources})
24
+
add_darling_object_library(libc-compat ${compat_sources})
25
25
#SET_TARGET_PROPERTIES(libc-compat PROPERTIES COMPILE_DEFINITIONS "__DARWIN_NON_CANCELABLE")
26
26
27
27
# ***
···
41
41
# Legacy variants
42
42
# ***
43
43
44
-
set(compat-legacy_sources FreeBSD/creat.c FreeBSD/killpg.c)
45
-
add_library(libc-compat_legacy OBJECT ${compat-legacy_sources})
46
-
SET_TARGET_PROPERTIES(libc-compat_legacy PROPERTIES
47
-
COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_LEGACY;_NONSTD_SOURCE"
48
-
COMPILE_FLAGS "-U__DARWIN_NON_CANCELABLE -U__DARWIN_UNIX03 -U_DARWIN_C_SOURCE -U_POSIX_C_SOURCE")
49
-
44
+
if (TARGET_i386)
45
+
set(compat-legacy_sources FreeBSD/creat.c FreeBSD/killpg.c)
46
+
add_library(libc-compat_legacy OBJECT ${compat-legacy_sources})
47
+
SET_TARGET_PROPERTIES(libc-compat_legacy PROPERTIES
48
+
COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_LEGACY;_NONSTD_SOURCE"
49
+
COMPILE_FLAGS "-U__DARWIN_NON_CANCELABLE -U__DARWIN_UNIX03 -U_DARWIN_C_SOURCE -U_POSIX_C_SOURCE")
50
+
endif (TARGET_i386)
+1
-1
src/libc/darwin/CMakeLists.txt
+1
-1
src/libc/darwin/CMakeLists.txt
+1
-1
src/libc/db/CMakeLists.txt
+1
-1
src/libc/db/CMakeLists.txt
src/libc/empty.c
src/libc/empty.c
This is a binary file and will not be displayed.
+1
-1
src/libc/emulated/CMakeLists.txt
+1
-1
src/libc/emulated/CMakeLists.txt
+10
-9
src/libc/gdtoa/CMakeLists.txt
+10
-9
src/libc/gdtoa/CMakeLists.txt
···
38
38
#SET_SOURCE_FILES_PROPERTIES(FreeBSD/gdtoa-strtod.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_STRTOD -DLIBC_ALIAS_STRTOD_L")
39
39
#SET_SOURCE_FILES_PROPERTIES(FreeBSD/gdtoa-strtof.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_STRTOF -DLIBC_ALIAS_STRTOF_L")
40
40
41
-
add_library(libc-gdtoa OBJECT ${gdtoa_sources})
41
+
add_darling_object_library(libc-gdtoa ${gdtoa_sources})
42
42
add_library(libc-gdtoa_dyld OBJECT ${gdtoa_sources})
43
43
set_target_properties(libc-gdtoa_dyld PROPERTIES COMPILE_FLAGS "-DVARIANT_DYLD")
44
44
make_fat(libc-gdtoa_dyld)
45
45
46
46
# Legacy variant
47
-
set(gdtoa-legacy_sources
48
-
FreeBSD/gdtoa-strtod.c
49
-
FreeBSD/gdtoa-strtodg.c
50
-
FreeBSD/gdtoa-strtof.c)
51
-
add_library(libc-gdtoa_legacy OBJECT ${gdtoa-legacy_sources})
52
-
SET_TARGET_PROPERTIES(libc-gdtoa_legacy PROPERTIES COMPILE_FLAGS
53
-
"-DBUILDING_VARIANT -DVARIANT_LEGACY -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0")
54
-
47
+
if (TARGET_i386)
48
+
set(gdtoa-legacy_sources
49
+
FreeBSD/gdtoa-strtod.c
50
+
FreeBSD/gdtoa-strtodg.c
51
+
FreeBSD/gdtoa-strtof.c)
52
+
add_library(libc-gdtoa_legacy OBJECT ${gdtoa-legacy_sources})
53
+
SET_TARGET_PROPERTIES(libc-gdtoa_legacy PROPERTIES COMPILE_FLAGS
54
+
"-DBUILDING_VARIANT -DVARIANT_LEGACY -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0")
55
+
endif (TARGET_i386)
+12
-10
src/libc/gen/CMakeLists.txt
+12
-10
src/libc/gen/CMakeLists.txt
···
160
160
NetBSD/utmpx.c
161
161
)
162
162
163
-
add_library(libc-gen OBJECT ${gen_sources})
163
+
add_darling_object_library(libc-gen ${gen_sources})
164
164
165
165
# ***
166
166
# Cancelable variants
···
183
183
# Legacy variants
184
184
# ***
185
185
186
-
set(gen-legacy_sources FreeBSD/clock.c FreeBSD/closedir.c FreeBSD/fnmatch.c
187
-
FreeBSD/lockf.c FreeBSD/pause.c FreeBSD/popen.c FreeBSD/rewinddir.c
188
-
FreeBSD/seekdir.c FreeBSD/setmode.c FreeBSD/sleep.c FreeBSD/telldir.c
189
-
FreeBSD/ttyname.c FreeBSD/usleep.c FreeBSD/wait.c FreeBSD/waitpid.c
190
-
FreeBSD/timezone.c FreeBSD/termios.c FreeBSD/nice.c
191
-
confstr.c crypt.c nftw.c FreeBSD/opendir.c nanosleep.c)
186
+
if (TARGET_i386)
187
+
set(gen-legacy_sources FreeBSD/clock.c FreeBSD/closedir.c FreeBSD/fnmatch.c
188
+
FreeBSD/lockf.c FreeBSD/pause.c FreeBSD/popen.c FreeBSD/rewinddir.c
189
+
FreeBSD/seekdir.c FreeBSD/setmode.c FreeBSD/sleep.c FreeBSD/telldir.c
190
+
FreeBSD/ttyname.c FreeBSD/usleep.c FreeBSD/wait.c FreeBSD/waitpid.c
191
+
FreeBSD/timezone.c FreeBSD/termios.c FreeBSD/nice.c
192
+
confstr.c crypt.c nftw.c FreeBSD/opendir.c nanosleep.c)
192
193
193
-
add_library(libc-gen_legacy OBJECT ${gen-legacy_sources})
194
-
SET_TARGET_PROPERTIES(libc-gen_legacy PROPERTIES COMPILE_FLAGS
195
-
"-DBUILDING_VARIANT -DVARIANT_LEGACY -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_64_BIT_INO_T -D_DARWIN_NO_64_BIT_INODE")
194
+
add_library(libc-gen_legacy OBJECT ${gen-legacy_sources})
195
+
SET_TARGET_PROPERTIES(libc-gen_legacy PROPERTIES COMPILE_FLAGS
196
+
"-DBUILDING_VARIANT -DVARIANT_LEGACY -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_64_BIT_INO_T -D_DARWIN_NO_64_BIT_INODE")
197
+
endif (TARGET_i386)
196
198
197
199
# ***
198
200
# DARWIN_EXTSN variants
+1
-1
src/libc/gmon/CMakeLists.txt
+1
-1
src/libc/gmon/CMakeLists.txt
+8
-6
src/libc/locale/CMakeLists.txt
+8
-6
src/libc/locale/CMakeLists.txt
···
75
75
)
76
76
SET_SOURCE_FILES_PROPERTIES(FreeBSD/wcsftime.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_WCSFTIME -DLIBC_ALIAS_WCSFTIME_L")
77
77
78
-
add_library(libc-locale OBJECT ${locale_sources})
78
+
add_darling_object_library(libc-locale ${locale_sources})
79
79
80
80
# Legacy variant
81
-
set(locale-legacy_sources
82
-
FreeBSD/wcsftime.c)
83
-
add_library(libc-locale_legacy OBJECT ${locale-legacy_sources})
84
-
SET_TARGET_PROPERTIES(libc-locale_legacy PROPERTIES COMPILE_FLAGS
85
-
"-DBUILDING_VARIANT -DVARIANT_LEGACY -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0")
81
+
if (TARGET_i386)
82
+
set(locale-legacy_sources
83
+
FreeBSD/wcsftime.c)
84
+
add_library(libc-locale_legacy OBJECT ${locale-legacy_sources})
85
+
SET_TARGET_PROPERTIES(libc-locale_legacy PROPERTIES COMPILE_FLAGS
86
+
"-DBUILDING_VARIANT -DVARIANT_LEGACY -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0")
87
+
endif (TARGET_i386)
86
88
87
89
if (NOT DARLING_NO_EXECUTABLES)
88
90
install(DIRECTORY locale DESTINATION libexec/darling/usr/share)
+7
-5
src/libc/net/CMakeLists.txt
+7
-5
src/libc/net/CMakeLists.txt
···
29
29
inet_pton.c
30
30
)
31
31
32
-
add_library(libc-net OBJECT ${net_sources})
32
+
add_darling_object_library(libc-net ${net_sources})
33
33
34
34
# ***
35
35
# Cancelable variants
···
41
41
# ***
42
42
# Legacy i386 variants
43
43
#
44
-
set(net-legacy_sources FreeBSD/recv.c FreeBSD/send.c)
45
-
add_library(libc-net_legacy OBJECT ${net-legacy_sources})
46
-
SET_TARGET_PROPERTIES(libc-net_legacy PROPERTIES COMPILE_FLAGS
47
-
"-DBUILDING_VARIANT -DVARIANT_LEGACY -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_64_BIT_INO_T -D_DARWIN_NO_64_BIT_INODE")
44
+
if (TARGET_i386)
45
+
set(net-legacy_sources FreeBSD/recv.c FreeBSD/send.c)
46
+
add_library(libc-net_legacy OBJECT ${net-legacy_sources})
47
+
SET_TARGET_PROPERTIES(libc-net_legacy PROPERTIES COMPILE_FLAGS
48
+
"-DBUILDING_VARIANT -DVARIANT_LEGACY -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0 -U__DARWIN_64_BIT_INO_T -D_DARWIN_NO_64_BIT_INODE")
49
+
endif (TARGET_i386)
+1
-1
src/libc/nls/CMakeLists.txt
+1
-1
src/libc/nls/CMakeLists.txt
+1
-1
src/libc/os/CMakeLists.txt
+1
-1
src/libc/os/CMakeLists.txt
+8
-6
src/libc/regex/CMakeLists.txt
+8
-6
src/libc/regex/CMakeLists.txt
···
21
21
22
22
SET_SOURCE_FILES_PROPERTIES(TRE/lib/regcomp.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_REGCOMP")
23
23
24
-
add_library(libc-regex OBJECT ${regex_sources})
24
+
add_darling_object_library(libc-regex ${regex_sources})
25
25
26
26
# Legacy variant
27
-
set(regex-legacy_sources
28
-
TRE/lib/regcomp.c)
29
-
add_library(libc-regex_legacy OBJECT ${regex-legacy_sources})
30
-
SET_TARGET_PROPERTIES(libc-regex_legacy PROPERTIES COMPILE_FLAGS
31
-
"-DBUILDING_VARIANT -DVARIANT_LEGACY -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0")
27
+
if (TARGET_i386)
28
+
set(regex-legacy_sources
29
+
TRE/lib/regcomp.c)
30
+
add_library(libc-regex_legacy OBJECT ${regex-legacy_sources})
31
+
SET_TARGET_PROPERTIES(libc-regex_legacy PROPERTIES COMPILE_FLAGS
32
+
"-DBUILDING_VARIANT -DVARIANT_LEGACY -U__DARWIN_UNIX03 -D__DARWIN_UNIX03=0")
33
+
endif (TARGET_i386)
+1
-1
src/libc/secure/CMakeLists.txt
+1
-1
src/libc/secure/CMakeLists.txt
+11
-8
src/libc/stdio/CMakeLists.txt
+11
-8
src/libc/stdio/CMakeLists.txt
···
129
129
set_source_files_properties(FreeBSD/fwrite.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_FWRITE")
130
130
set_source_files_properties(FreeBSD/tempnam.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_TEMPNAM")
131
131
132
-
add_library(libc-stdio OBJECT ${stdio_sources})
132
+
add_darling_object_library(libc-stdio ${stdio_sources})
133
133
#SET_TARGET_PROPERTIES(libc-stdio PROPERTIES COMPILE_DEFINITIONS "VARIANT_DARWINEXTSN")
134
134
135
135
# ***
136
136
# Legacy variants
137
137
# ***
138
138
139
-
set(stdio-legacy_sources
140
-
FreeBSD/fopen.c FreeBSD/fdopen.c
141
-
FreeBSD/fputs.c FreeBSD/tempnam.c
142
-
FreeBSD/freopen.c FreeBSD/fwrite.c)
139
+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_DARWIN_C_SOURCE -U_POSIX_C_SOURCE")
140
+
141
+
if (TARGET_i386)
142
+
set(stdio-legacy_sources
143
+
FreeBSD/fopen.c FreeBSD/fdopen.c
144
+
FreeBSD/fputs.c FreeBSD/tempnam.c
145
+
FreeBSD/freopen.c FreeBSD/fwrite.c)
143
146
144
-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_DARWIN_C_SOURCE -U_POSIX_C_SOURCE")
145
-
add_library(libc-stdio_legacy OBJECT ${stdio-legacy_sources})
146
-
SET_TARGET_PROPERTIES(libc-stdio_legacy PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_LEGACY")
147
+
add_library(libc-stdio_legacy OBJECT ${stdio-legacy_sources})
148
+
SET_TARGET_PROPERTIES(libc-stdio_legacy PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_LEGACY")
149
+
endif (TARGET_i386)
147
150
148
151
# ***
149
152
# DARWIN_EXTSN variants
+7
-5
src/libc/stdlib/CMakeLists.txt
+7
-5
src/libc/stdlib/CMakeLists.txt
···
85
85
SET_SOURCE_FILES_PROPERTIES(FreeBSD/setenv.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_SETENV -DLIBC_ALIAS_UNSETENV")
86
86
SET_SOURCE_FILES_PROPERTIES(FreeBSD/putenv.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_PUTENV")
87
87
88
-
add_library(libc-stdlib OBJECT ${stdlib_sources})
88
+
add_darling_object_library(libc-stdlib ${stdlib_sources})
89
89
90
90
# Cancelable variant
91
91
set(stdlib-cancelable_sources FreeBSD/system.c)
···
93
93
SET_TARGET_PROPERTIES(libc-stdlib_cancelable PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_CANCELABLE")
94
94
95
95
# Legacy variant
96
-
set(stdlib-legacy_sources FreeBSD/getopt.c FreeBSD/realpath.c
97
-
FreeBSD/setenv.c FreeBSD/putenv.c)
98
-
add_library(libc-stdlib_legacy OBJECT ${stdlib-legacy_sources})
99
-
SET_TARGET_PROPERTIES(libc-stdlib_legacy PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_LEGACY")
96
+
if (TARGET_i386)
97
+
set(stdlib-legacy_sources FreeBSD/getopt.c FreeBSD/realpath.c
98
+
FreeBSD/setenv.c FreeBSD/putenv.c)
99
+
add_library(libc-stdlib_legacy OBJECT ${stdlib-legacy_sources})
100
+
SET_TARGET_PROPERTIES(libc-stdlib_legacy PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_LEGACY")
101
+
endif (TARGET_i386)
100
102
101
103
# DARWIN_EXTSN variant
102
104
set(stdlib-extsn_sources FreeBSD/realpath.c)
+9
-8
src/libc/stdtime/CMakeLists.txt
+9
-8
src/libc/stdtime/CMakeLists.txt
···
22
22
SET_SOURCE_FILES_PROPERTIES(FreeBSD/strftime.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_STRFTIME -DLIBC_ALIAS_STRFTIME_L")
23
23
SET_SOURCE_FILES_PROPERTIES(FreeBSD/strptime.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_STRPTIME -DLIBC_ALIAS_STRPTIME_L")
24
24
25
-
add_library(libc-stdtime OBJECT ${stdtime_sources})
25
+
add_darling_object_library(libc-stdtime ${stdtime_sources})
26
26
27
27
# Legacy variant
28
-
set(stdtime-legacy_sources
29
-
FreeBSD/localtime.c
30
-
FreeBSD/strftime.c
31
-
FreeBSD/strptime.c)
32
-
add_library(libc-stdtime_legacy OBJECT ${stdtime-legacy_sources})
33
-
SET_TARGET_PROPERTIES(libc-stdtime_legacy PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_LEGACY")
34
-
28
+
if (TARGET_i386)
29
+
set(stdtime-legacy_sources
30
+
FreeBSD/localtime.c
31
+
FreeBSD/strftime.c
32
+
FreeBSD/strptime.c)
33
+
add_library(libc-stdtime_legacy OBJECT ${stdtime-legacy_sources})
34
+
SET_TARGET_PROPERTIES(libc-stdtime_legacy PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_LEGACY")
35
+
endif (TARGET_i386)
+7
-5
src/libc/string/CMakeLists.txt
+7
-5
src/libc/string/CMakeLists.txt
···
87
87
88
88
SET_SOURCE_FILES_PROPERTIES(FreeBSD/strerror.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DLIBC_ALIAS_STRERROR")
89
89
90
-
add_library(libc-string OBJECT ${string_sources})
90
+
add_darling_object_library(libc-string ${string_sources})
91
91
add_library(libc-string-x86_64 OBJECT ${string_x86_64_sources})
92
92
set_target_properties(libc-string-x86_64 PROPERTIES COMPILE_FLAGS "-arch x86_64")
93
93
···
95
95
set_target_properties(libc-string-i386 PROPERTIES COMPILE_FLAGS "-arch i386")
96
96
97
97
# Legacy variant
98
-
set(string-legacy_sources
99
-
FreeBSD/strerror.c)
100
-
add_library(libc-string_legacy OBJECT ${string-legacy_sources})
101
-
SET_TARGET_PROPERTIES(libc-string_legacy PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_LEGACY")
98
+
if (TARGET_i386)
99
+
set(string-legacy_sources
100
+
FreeBSD/strerror.c)
101
+
add_library(libc-string_legacy OBJECT ${string-legacy_sources})
102
+
SET_TARGET_PROPERTIES(libc-string_legacy PROPERTIES COMPILE_DEFINITIONS "BUILDING_VARIANT;VARIANT_LEGACY")
103
+
endif (TARGET_i386)
102
104
103
105
# DYLD variant
104
106
add_library(libc-string_dyld OBJECT strcat.c strcpy.c FreeBSD/strdup.c strlcat.c strlcpy.c FreeBSD/strnlen.c FreeBSD/strrchr.c FreeBSD/strstr.c FreeBSD/strtok.c
+1
-1
src/libc/sys/CMakeLists.txt
+1
-1
src/libc/sys/CMakeLists.txt
···
40
40
SET_SOURCE_FILES_PROPERTIES(sigtramp.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE")
41
41
SET_SOURCE_FILES_PROPERTIES(OpenBSD/stack_protector.c PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -fno-stack-protector")
42
42
43
-
add_library(libc-sys OBJECT ${sys_sources})
43
+
add_darling_object_library(libc-sys ${sys_sources})
44
44
45
45
# ***
46
46
# No-INODE64 variants
+1
-1
src/libc/util/CMakeLists.txt
+1
-1
src/libc/util/CMakeLists.txt
+1
-1
src/libc/uuid/CMakeLists.txt
+1
-1
src/libc/uuid/CMakeLists.txt
+9
-8
src/libc/x86_64/CMakeLists.txt
+9
-8
src/libc/x86_64/CMakeLists.txt
···
7
7
8
8
#set(CMAKE_C_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_C_FLAGS} -include ${CMAKE_CURRENT_SOURCE_DIR}/../../duct/include/commpage.h -include ${DARLING_TOP_DIRECTORY}/platform-include/sys/time.h")
9
9
10
-
set(x86_64_sources
11
-
gen/mcount.S
12
-
string/strcpy.S
13
-
string/strlen.S
14
-
string/strncpy.S
15
-
string/strnlen.S
16
-
)
17
-
10
+
if (TARGET_x86_64)
11
+
set(x86_64_sources
12
+
gen/mcount.S
13
+
string/strcpy.S
14
+
string/strlen.S
15
+
string/strncpy.S
16
+
string/strnlen.S
17
+
)
18
+
endif (TARGET_x86_64)
18
19
19
20
add_library(libc-x86_64 OBJECT ${x86_64_sources})
20
21
+1
-1
src/libinfo/darling-resolver/CMakeLists.txt
+1
-1
src/libinfo/darling-resolver/CMakeLists.txt
+1
-1
src/libinfo/dns.subproj/CMakeLists.txt
+1
-1
src/libinfo/dns.subproj/CMakeLists.txt
+1
-1
src/libinfo/gen.subproj/CMakeLists.txt
+1
-1
src/libinfo/gen.subproj/CMakeLists.txt
+1
-1
src/libinfo/lookup.subproj/CMakeLists.txt
+1
-1
src/libinfo/lookup.subproj/CMakeLists.txt
+1
-1
src/libinfo/membership.subproj/CMakeLists.txt
+1
-1
src/libinfo/membership.subproj/CMakeLists.txt
+1
-1
src/libinfo/nis.subproj/CMakeLists.txt
+1
-1
src/libinfo/nis.subproj/CMakeLists.txt
+1
-1
src/libinfo/rpc.subproj/CMakeLists.txt
+1
-1
src/libinfo/rpc.subproj/CMakeLists.txt
+1
-1
src/libinfo/util.subproj/CMakeLists.txt
+1
-1
src/libinfo/util.subproj/CMakeLists.txt
+1
-1
src/libm/CMakeLists.txt
+1
-1
src/libm/CMakeLists.txt
···
150
150
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
151
151
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
152
152
153
-
add_library(system_m_extra OBJECT Source/Intel/xmm_misc.c Source/Intel/xmm_log.c Source/Intel/fmaxfminfdim.S Source/Intel/nextafter.S Source/Intel/xmm_remainder.c Source/Intel/e_remquol.S)
153
+
add_darling_object_library(system_m_extra Source/Intel/xmm_misc.c Source/Intel/xmm_log.c Source/Intel/fmaxfminfdim.S Source/Intel/nextafter.S Source/Intel/xmm_remainder.c Source/Intel/e_remquol.S)
154
154
set_target_properties(system_m_extra PROPERTIES COMPILE_FLAGS "-UBUILDING_FOR_CARBONCORE_LEGACY -O0 -ggdb")
155
155
make_fat(system_m_extra)
156
156
+1
-1
src/ncurses/CMakeLists.txt
+1
-1
src/ncurses/CMakeLists.txt
···
34
34
add_darling_executable(clear progs/clear.c)
35
35
target_link_libraries(clear ncurses)
36
36
37
-
add_library(nc_dump_entry OBJECT progs/dump_entry.c)
37
+
add_darling_object_library(nc_dump_entry progs/dump_entry.c)
38
38
39
39
add_darling_executable(infocmp progs/infocmp.c $<TARGET_OBJECTS:nc_dump_entry>)
40
40
target_link_libraries(infocmp ncurses)
+14
-13
src/xtrace/CMakeLists.txt
+14
-13
src/xtrace/CMakeLists.txt
···
3
3
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc")
4
4
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc -fno-exceptions -fno-rtti -std=c++11")
5
5
6
-
include(darling_lib)
7
-
8
6
set(xtrace_sources
9
7
xtracelib.c
10
8
simple.c
···
13
11
bsd_trace.cpp
14
12
)
15
13
16
-
set(DYLIB_INSTALL_NAME "/usr/lib/darling/libxtrace.dylib")
17
-
add_darling_library(xtracelib SHARED ${xtrace_sources})
18
-
set_target_properties(xtracelib PROPERTIES OUTPUT_NAME "xtrace")
19
-
target_link_libraries(xtracelib system)
14
+
if (TARGET_x86_64)
15
+
set(DARLING_LIB_x86_64_ONLY TRUE)
16
+
set(DYLIB_INSTALL_NAME "/usr/lib/darling/libxtrace.dylib")
17
+
add_darling_library(xtracelib SHARED ${xtrace_sources})
18
+
set_target_properties(xtracelib PROPERTIES OUTPUT_NAME "xtrace")
19
+
target_link_libraries(xtracelib system)
20
20
21
-
install(TARGETS xtracelib DESTINATION libexec/darling/usr/lib/darling)
22
-
install(FILES xtrace DESTINATION libexec/darling/usr/bin
23
-
PERMISSIONS
24
-
OWNER_READ OWNER_WRITE OWNER_EXECUTE
25
-
GROUP_READ GROUP_EXECUTE
26
-
WORLD_READ WORLD_EXECUTE
27
-
)
21
+
install(TARGETS xtracelib DESTINATION libexec/darling/usr/lib/darling)
22
+
install(FILES xtrace DESTINATION libexec/darling/usr/bin
23
+
PERMISSIONS
24
+
OWNER_READ OWNER_WRITE OWNER_EXECUTE
25
+
GROUP_READ GROUP_EXECUTE
26
+
WORLD_READ WORLD_EXECUTE
27
+
)
28
+
endif (TARGET_x86_64)