Skip to content

Commit 4cad7cf

Browse files
committed
[4.1] Revert "Merge pull request #1330 from compnerd/ELF-registration"
This reverts commit 67a5d39, reversing changes made to e41c5e4. I believe this is breaking linux bots and I believe this needs synchronized changes in swift-4.1-branch of swift. rdar://35780906
1 parent f0335d2 commit 4cad7cf

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

lib/product.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ def project_headers_path(self):
7171
return Path.path(Configuration.current.build_directory.path_by_appending(self.name).absolute() + "/" + self.PROJECT_HEADERS_FOLDER_PATH)
7272

7373
class Library(Product):
74-
runtime_object = ''
74+
conformance_begin = ""
75+
conformance_end = ""
7576
rule = None
7677
def __init__(self, name):
7778
Product.__init__(self, name)
@@ -90,7 +91,7 @@ def generate(self, flags, objects = []):
9091
product_flags += " -lstdc++"
9192

9293
generated += """
93-
build """ + self.product.relative() + """: """ + self.rule + """ """ + self.runtime_object + """ """ + " ".join(objects) + """ """ + self.generate_dependencies() + """
94+
build """ + self.product.relative() + """: """ + self.rule + """ """ + self.conformance_begin + """ """ + " ".join(objects) + """ """ + self.conformance_end + """ """ + self.generate_dependencies() + """
9495
flags = """ + product_flags
9596
if self.needs_objc:
9697
generated += """
@@ -118,7 +119,8 @@ def generate(self, objects = []):
118119
self.rule = "Link"
119120
self.product_name = Configuration.current.target.dynamic_library_prefix + self.name + Configuration.current.target.dynamic_library_suffix
120121
if Configuration.current.target.sdk == OSType.Linux or Configuration.current.target.sdk == OSType.FreeBSD:
121-
self.runtime_object = '${SDKROOT}/lib/swift/${OS}/${ARCH}/swiftrt.o'
122+
self.conformance_begin = '${SDKROOT}/lib/swift/${OS}/${ARCH}/swift_begin.o'
123+
self.conformance_end = '${SDKROOT}/lib/swift/${OS}/${ARCH}/swift_end.o'
122124
return Library.generate(self, ["-shared", "-Wl,-soname," + self.product_name, "-Wl,--no-undefined"], objects)
123125
else:
124126
return Library.generate(self, ["-shared"], objects)
@@ -180,7 +182,8 @@ def __init__(self, name):
180182
def generate(self, objects = []):
181183
self.rule = "Archive"
182184
self.product_name = Configuration.current.target.static_library_prefix + self.name + Configuration.current.target.static_library_suffix
183-
self.runtime_object = ''
185+
self.conformance_begin = ''
186+
self.conformance_end = ''
184187
return Library.generate(self, [], objects)
185188

186189
class StaticAndDynamicLibrary(StaticLibrary, DynamicLibrary):

0 commit comments

Comments
 (0)