@@ -71,8 +71,7 @@ def project_headers_path(self):
71
71
return Path .path (Configuration .current .build_directory .path_by_appending (self .name ).absolute () + "/" + self .PROJECT_HEADERS_FOLDER_PATH )
72
72
73
73
class Library (Product ):
74
- conformance_begin = ""
75
- conformance_end = ""
74
+ runtime_object = ''
76
75
rule = None
77
76
def __init__ (self , name ):
78
77
Product .__init__ (self , name )
@@ -91,7 +90,7 @@ def generate(self, flags, objects = []):
91
90
product_flags += " -lstdc++"
92
91
93
92
generated += """
94
- build """ + self .product .relative () + """: """ + self .rule + """ """ + self .conformance_begin + """ """ + " " .join (objects ) + """ """ + self . conformance_end + """ """ + self .generate_dependencies () + """
93
+ build """ + self .product .relative () + """: """ + self .rule + """ """ + self .runtime_object + """ """ + " " .join (objects ) + """ """ + self .generate_dependencies () + """
95
94
flags = """ + product_flags
96
95
if self .needs_objc :
97
96
generated += """
@@ -119,8 +118,7 @@ def generate(self, objects = []):
119
118
self .rule = "Link"
120
119
self .product_name = Configuration .current .target .dynamic_library_prefix + self .name + Configuration .current .target .dynamic_library_suffix
121
120
if Configuration .current .target .sdk == OSType .Linux or Configuration .current .target .sdk == OSType .FreeBSD :
122
- self .conformance_begin = '${SDKROOT}/lib/swift/${OS}/${ARCH}/swift_begin.o'
123
- self .conformance_end = '${SDKROOT}/lib/swift/${OS}/${ARCH}/swift_end.o'
121
+ self .runtime_object = '${SDKROOT}/lib/swift/${OS}/${ARCH}/swiftrt.o'
124
122
return Library .generate (self , ["-shared" , "-Wl,-soname," + self .product_name , "-Wl,--no-undefined" ], objects )
125
123
else :
126
124
return Library .generate (self , ["-shared" ], objects )
@@ -182,8 +180,7 @@ def __init__(self, name):
182
180
def generate (self , objects = []):
183
181
self .rule = "Archive"
184
182
self .product_name = Configuration .current .target .static_library_prefix + self .name + Configuration .current .target .static_library_suffix
185
- self .conformance_begin = ''
186
- self .conformance_end = ''
183
+ self .runtime_object = ''
187
184
return Library .generate (self , [], objects )
188
185
189
186
class StaticAndDynamicLibrary (StaticLibrary , DynamicLibrary ):
0 commit comments