Changeset 253884 in webkit

Timestamp:

Dec 23, 2019 8:07:57 AM (4 years ago)

Author:

youenn@apple.com

Message:

Do not build yasm for iOS and iOS simulator
​https://bugs.webkit.org/show_bug.cgi?id=205556
<rdar://problem/58159497>

Reviewed by Eric Carlson.

Now that we no longer need yasm for iOS simulator, we can stop building it for iOS and iOS simulator.
We can also remove the hack to run yasm.

• Configurations/yasm.xcconfig:
• libwebrtc.xcodeproj/project.pbxproj:

Location:

trunk/Source/ThirdParty/libwebrtc

Files:

• ChangeLog (modified) (1 diff)
• Configurations/yasm.xcconfig (modified) (1 diff)
• libwebrtc.xcodeproj/project.pbxproj (modified) (1 diff)

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2019-12-23  youenn fablet  <youenn@apple.com>
+
+        Do not build yasm for iOS and iOS simulator
+        https://bugs.webkit.org/show_bug.cgi?id=205556
+        <rdar://problem/58159497>
+
+        Reviewed by Eric Carlson.
+
+        Now that we no longer need yasm for iOS simulator, we can stop building it for iOS and iOS simulator.
+        We can also remove the hack to run yasm.
+
+        * Configurations/yasm.xcconfig:
+        * libwebrtc.xcodeproj/project.pbxproj:
+
 2019-12-22  youenn fablet  <youenn@apple.com>
 

trunk/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig

@@ -17 +17 @@
 CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = *_neon.c arm_cpudetect.c *_arm.c sad.c;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = *_neon.c arm_cpudetect.c *_arm.c sad.c;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *_sse2.c *_ssse3.c *_sse4.c *_avx2.c *_avx.c *_sse2.asm.o *_sse3.asm.o;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = *;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *;
 
 WK_ASAN_DISALLOWED = YES;
+
+SUPPORTED_PLATFORMS = macosx;

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

@@ -3545 +3545 @@
                                 "${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o",
                         );
-                        script = "# This DYLD_ROOT_PATH hack is there to allow the yasm binary to run on macOS if it was built for another platform (e.g. iphonesimulator) - rdar://52020841 and rdar://50479465\nDYLD_ROOT_PATH=/ ${BUILT_PRODUCTS_DIR}/yasm -fmacho64 -I ${SRCROOT}/Source/third_party/libvpx/source/config -I ${SRCROOT}/Source/third_party/libvpx/source/config/mac/x64 -I ${SRCROOT}/Source/third_party/libvpx/source/libvpx -o ${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o ${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.asm\n";
+                        script = "${BUILT_PRODUCTS_DIR}/yasm -fmacho64 -I ${SRCROOT}/Source/third_party/libvpx/source/config -I ${SRCROOT}/Source/third_party/libvpx/source/config/mac/x64 -I ${SRCROOT}/Source/third_party/libvpx/source/libvpx -o ${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o ${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.asm\n";
                 };
 /* End PBXBuildRule section */