Skip to content

Commit

Permalink
Unreviewed, fix iOS production builds after 270071@main
Browse files Browse the repository at this point in the history
Fix the following build error:
```
Undefined symbols for architecture arm64e:
  "_JSContextGetGlobalObject", referenced from:
      WTR::sendTestRenderedEvent(OpaqueJSContext*) in WPTFunctions.o
      WTR::hasTestWaitAttribute(OpaqueJSContext*) in WPTFunctions.o
  "_JSObjectMake", referenced from:
      WTR::sendTestRenderedEvent(OpaqueJSContext*) in WPTFunctions.o
  "_JSValueProtect", referenced from:
      WTR::sendTestRenderedEvent(OpaqueJSContext*) in WPTFunctions.o
  "_JSValueToBoolean", referenced from:
      WTR::hasTestWaitAttribute(OpaqueJSContext*) in WPTFunctions.o
  "_JSValueUnprotect", referenced from:
      WTR::sendTestRenderedEvent(OpaqueJSContext*) in WPTFunctions.o
  "WTR::setProperty(OpaqueJSContext const*, OpaqueJSValue*, char const*, bool)", referenced from:
      WTR::sendTestRenderedEvent(OpaqueJSContext*) in WPTFunctions.o
  "WTR::objectProperty(OpaqueJSContext const*, OpaqueJSValue*, std::initializer_list<char const*>)", referenced from:
      WTR::sendTestRenderedEvent(OpaqueJSContext*) in WPTFunctions.o

 WTR::hasTestWaitAttribute(OpaqueJSContext*) in WPTFunctions.o
  "WTR::callConstructor(OpaqueJSContext*, char const*, std::initializer_list<OpaqueJSValue const*>)", referenced from:
      WTR::sendTestRenderedEvent(OpaqueJSContext*) in WPTFunctions.o
  "WTR::call(OpaqueJSContext const*, OpaqueJSValue*, char const*, std::initializer_list<OpaqueJSValue const*>)", refe
renced from:
      WTR::sendTestRenderedEvent(OpaqueJSContext*) in WPTFunctions.o
      WTR::hasTestWaitAttribute(OpaqueJSContext*) in WPTFunctions.o
  "WTR::makeValue(OpaqueJSContext const*, char const*)", referenced from:
      WTR::sendTestRenderedEvent(OpaqueJSContext*) in WPTFunctions.o
      WTR::hasTestWaitAttribute(OpaqueJSContext*) in WPTFunctions.o
  "WTF::URL::host() const", referenced from:
      WTR::isWebPlatformTestURL(WTF::URL const&) in WPTFunctions.o
  "WTF::URL::port() const", referenced from:
      WTR::isWebPlatformTestURL(WTF::URL const&) in WPTFunctions.o
ld: symbol(s) not found for architecture arm64e
clang: error: linker command failed with exit code 1 (use -v to see invocation)
```

...by removing `WPTFunctions.o` from the `WebKitTestRunner` binary
target. This is the correct thing to do because we pull in the symbols
in the `WPTFunctions` TU through the `WebKitTestRunnerLibrary` target
anyways, and because we don't link against WTF/JSC/etc. when building
the `WebKitTestRunner` binary on iOS.

* Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/270093@main
  • Loading branch information
aprotyas committed Nov 1, 2023
1 parent 3afefcc commit d31887d
Showing 1 changed file with 0 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
2E63EDA61891BDC0002A7AFC /* TestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */; };
2E749BF21891EBFA007FC175 /* EventSenderProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED7A1891ACE9002A7AFC /* EventSenderProxyIOS.mm */; };
31DA8A3D1E7205CC00E1DF2F /* IOSLayoutTestCommunication.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3148A0531E6F85B600D3B316 /* IOSLayoutTestCommunication.cpp */; };
33558B2D2AF1BF600041E63F /* WPTFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93C7881F250C69E400C0AA24 /* WPTFunctions.cpp */; };
33558B2E2AF1C22B0041E63F /* WPTFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93C7881F250C69E400C0AA24 /* WPTFunctions.cpp */; };
41C5378E21F13414008B1FAD /* TestWebsiteDataStoreDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 41C5378D21F1333C008B1FAD /* TestWebsiteDataStoreDelegate.mm */; };
41D5B62622DD9D36000F4C4A /* FakeHelvetica-SingleExtendedCharacter.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 41D5B62522DD9D36000F4C4A /* FakeHelvetica-SingleExtendedCharacter.ttf */; };
Expand Down Expand Up @@ -1265,7 +1264,6 @@
E132AA3D17CE776F00611DF0 /* WebKitTestRunnerEvent.mm in Sources */,
E1C642C617CBCD4C00D66A3C /* WebKitTestRunnerPasteboard.mm in Sources */,
9376417A210D737200A3DAAE /* WebKitTestRunnerWindow.mm in Sources */,
33558B2D2AF1BF600041E63F /* WPTFunctions.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down

0 comments on commit d31887d

Please sign in to comment.