Changeset 233155 in webkit

Timestamp:

Jun 25, 2018, 10:39:59 AM (8 years ago)

Author:

Keith Rollin

Message:

Adjust webrtc library for LTO
​https://bugs.webkit.org/show_bug.cgi?id=186952
<rdar://problem/41387815>

Reviewed by Youenn Fablet.

There are a number of files in webrtc that have main() functions (in
particular, rtpcat.cc and click_annotate.cc). When compiling with LTO,
these symbols are exposed to each other, leading to the following
build failure:

Ld libwebrtc.dylib
duplicate symbol _main in:
ld: 1 duplicate symbol for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
BUILD FAILED

Address this by removing the indicated files from the build.

• libwebrtc.xcodeproj/project.pbxproj:

Location:

trunk/Source/ThirdParty/libwebrtc

Files:

• ChangeLog (modified) (1 diff)
• libwebrtc.xcodeproj/project.pbxproj (modified) (2 diffs)

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2018-06-25  Keith Rollin  <krollin@apple.com>
+
+        Adjust webrtc library for LTO
+        https://bugs.webkit.org/show_bug.cgi?id=186952
+        <rdar://problem/41387815>
+
+        Reviewed by Youenn Fablet.
+
+        There are a number of files in webrtc that have main() functions (in
+        particular, rtpcat.cc and click_annotate.cc). When compiling with LTO,
+        these symbols are exposed to each other, leading to the following
+        build failure:
+
+            Ld libwebrtc.dylib
+            duplicate symbol _main in:
+            ld: 1 duplicate symbol for architecture x86_64
+            clang: error: linker command failed with exit code 1 (use -v to see invocation)
+            ** BUILD FAILED **
+
+        Address this by removing the indicated files from the build.
+
+        * libwebrtc.xcodeproj/project.pbxproj:
+
 2018-06-14  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

@@ -2249 +2249 @@
                 5CDD8AB81E43C00F00621E92 /* rtp_generator.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD8A8B1E43C00F00621E92 /* rtp_generator.cc */; };
                 5CDD8AB91E43C00F00621E92 /* rtp_generator.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8A8C1E43C00F00621E92 /* rtp_generator.h */; };
-                5CDD8ABA1E43C00F00621E92 /* rtpcat.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD8A8D1E43C00F00621E92 /* rtpcat.cc */; };
                 5CDD8ACC1E43C23900621E92 /* audio_receive_stream.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD8ABD1E43C23900621E92 /* audio_receive_stream.cc */; };
                 5CDD8ACD1E43C23900621E92 /* audio_receive_stream.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8ABE1E43C23900621E92 /* audio_receive_stream.h */; };
@@ -2416 +2415 @@
                 5CDD8C671E43C60900621E92 /* opus_interface.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD8C5A1E43C60900621E92 /* opus_interface.c */; };
                 5CDD8C681E43C60900621E92 /* opus_interface.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8C5B1E43C60900621E92 /* opus_interface.h */; };
-                5CDD8C851E43C66000621E92 /* click_annotate.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD8C6C1E43C66000621E92 /* click_annotate.cc */; };
                 5CDD8C861E43C66000621E92 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8C6D1E43C66000621E92 /* common.h */; };
                 5CDD8C871E43C66000621E92 /* daubechies_8_wavelet_coeffs.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CDD8C6E1E43C66000621E92 /* daubechies_8_wavelet_coeffs.h */; };