Changeset 263375 in webkit


Ignore:
Timestamp:
Jun 22, 2020 4:42:01 PM (4 years ago)
Author:
timothy_horton@apple.com
Message:

libwebrtc fails to build on arm64
​https://bugs.webkit.org/show_bug.cgi?id=213476

Reviewed by Maciej Stachowiak.

  • Configurations/libvpx.xcconfig:
  • Configurations/libwebrtc.xcconfig:
  • Configurations/opus.xcconfig:

Use architecture conditionals instead of SDK conditionals for code that is
architecture-dependent.

Remove an macOS-version-dependent definition of EXCLUDED_SOURCE_FILE_NAMES
which is no longer used after r232665.

Location:
trunk/Source/ThirdParty/libwebrtc
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r263364 r263375  
     12020-06-22  Tim Horton  <timothy_horton@apple.com>
     2
     3        libwebrtc fails to build on arm64
     4        https://bugs.webkit.org/show_bug.cgi?id=213476
     5
     6        Reviewed by Maciej Stachowiak.
     7
     8        * Configurations/libvpx.xcconfig:
     9        * Configurations/libwebrtc.xcconfig:
     10        * Configurations/opus.xcconfig:
     11        Use architecture conditionals instead of SDK conditionals for code that is
     12        architecture-dependent.
     13
     14        Remove an macOS-version-dependent definition of EXCLUDED_SOURCE_FILE_NAMES
     15        which is no longer used after r232665.
     16
    1172020-06-22  Tim Horton  <timothy_horton@apple.com>
    218

  • trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig

    r253944 r263375  
    88ENABLE_STRICT_OBJC_MSGSEND = YES;
    99
    10 HEADER_SEARCH_PATHS[sdk=macos*] = Source/third_party/libvpx/source/config/mac/x64 Source/third_party/libvpx/source/libvpx Source/third_party/libvpx/source/config;
    11 HEADER_SEARCH_PATHS[sdk=iphonesimulator*] = Source/third_party/libvpx/source/config/mac/x64 Source/third_party/libvpx/source/libvpx Source/third_party/libvpx/source/config;
    12 HEADER_SEARCH_PATHS[sdk=iphoneos*] = Source/third_party/libvpx/source/config/ios/arm64 Source/third_party/libvpx/source/libvpx Source/third_party/libvpx/source/config;
     10HEADER_SEARCH_PATHS[arch=x86_64] = Source/third_party/libvpx/source/config/mac/x64 Source/third_party/libvpx/source/libvpx Source/third_party/libvpx/source/config;
     11HEADER_SEARCH_PATHS[arch=arm64*] = Source/third_party/libvpx/source/config/ios/arm64 Source/third_party/libvpx/source/libvpx Source/third_party/libvpx/source/config;
    1312
    1413INSTALL_PATH = /usr/local/lib;
    … …  
    2120X86_FILES = *_sse2.c *_ssse3.c *_sse4.c *_avx2.c *_avx.c *.asm
    2221
    23 EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*] = $(ARM_FILES) sad.c
    24 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = $(ARM_FILES) $(X86_FILES)
    25 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(X86_FILES)
     22EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*][arch=x86_64] = $(ARM_FILES) sad.c
     23EXCLUDED_SOURCE_FILE_NAMES[sdk=macos*][arch=arm64*] = $(X86_FILES)
     24EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*][arch=arm64*] = $(X86_FILES)
     25EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = $(X86_FILES) $(ARM_FILES)

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

    r252472 r263375  
    3333GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) WEBRTC_IOS;
    3434
    35 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *_sse.cc *_sse2.cc macutils.cc macwindowpicker.cc audio_device_mac.cc audio_mixer_manager_mac.cc logging_mac.mm;
    36 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = macutils.cc macwindowpicker.cc audio_device_mac.cc audio_mixer_manager_mac.cc logging_mac.mm;
    37 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = voice_processing_audio_unit.mm;
     35EXCLUDED_SOURCE_FILE_NAMES_macosx = voice_processing_audio_unit.mm;
     36EXCLUDED_SOURCE_FILE_NAMES_ios = macutils.cc macwindowpicker.cc audio_device_mac.cc audio_mixer_manager_mac.cc logging_mac.mm;
     37EXCLUDED_SOURCE_FILE_NAMES_arm = *_sse.cc *_sse2.cc;
     38
     39EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(EXCLUDED_SOURCE_FILE_NAMES_ios) $(EXCLUDED_SOURCE_FILE_NAMES_arm);
     40EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = $(EXCLUDED_SOURCE_FILE_NAMES_ios);
     41EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx);
     42EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*][arch=arm64*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx) $(EXCLUDED_SOURCE_FILE_NAMES_arm);
    3843
    3944OTHER_LDFLAGS[sdk=macosx10.13*] = $(inherited);

  • trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig

    r239510 r263375  
    1919
    2020EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = *_sse.c *_sse4_1.c x86_silk_map.c;
    21 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *_sse.c *_sse2.c *_sse4_1.c x86_silk_map.c;
    22 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     21EXCLUDED_SOURCE_FILE_NAMES[arch=arm64*] = *_sse.c *_sse2.c *_sse4_1.c x86_silk_map.c;
    2322
    2423// The iOS Simulator can't use SSE4 intrinsics, but macOS can.
Note: See TracChangeset for help on using the changeset viewer.