Build static library for JavaScriptCore before linking framework #19575

ddkilzer · 2023-10-26T00:43:20Z

`3d73290`

Build static library for JavaScriptCore before linking framework
https://bugs.webkit.org/show_bug.cgi?id=263697
<rdar://113641596>

Reviewed by Elliott Williams.

This change introduces a libJavaScriptCore.a target, which is then used
to link JavaScriptCore.framework. By configuring the project to build
this way, there is no need to duplicate the list of sources between both
targets. When JSC_USE_STATIC_LINKING=YES, the jsc binary is linked to
libJavaScriptCore.a instead of to JavaScriptCore.framework.

* Source/JavaScriptCore/API/JSWrapperMap.h:
* Source/JavaScriptCore/API/ObjCCallbackFunction.h:
- Fix header include paths to work with static library.
* Source/JavaScriptCore/Configurations/BaseTarget.xcconfig: Copy from Source/JavaScriptCore/Configurations/JSC.xcconfig.
- Extract common variables from JavaScriptCore.xcconfig that are shared
with libJavaScriptCore.xcconfig.
* Source/JavaScriptCore/Configurations/Base.xcconfig:
- Extract linker variables from JavaScriptCore.xcconfig that are shared
with JSC.xcconfig.
- Note that `-fobjc-link-runtime` replaces
`-lobjc -framework CoreFoundation -framework Foundation`.
* Source/JavaScriptCore/Configurations/JSC.xcconfig:
(JSC_USE_STATIC_LINKING): Add.
- Set to the same boolean value as ENABLE_LIBFUZZER (which will default
to NO), but make it a separate variable to allow this behavior to be
overriden via xcodebuild.
- Configure OTHER_LDFLAGS to statically link libJavaScriptCore.a when
JSC_USE_STATIC_LINKING=YES, else use dynamic linking (default) to
JavaScriptCore.framework.
* Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig:
- Extract shared variables into BaseTarget.xcconfig.
- Move build related variables into libJavaScriptCore.xcconfig.
* Source/JavaScriptCore/Configurations/libJavaScriptCore.xcconfig: Add.
- Move build-related variables from JavaScriptCore.xcconfig.
* Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:
- Add new xcconfig files to project.
- Add libJavaScriptCore.a target and use libJavaScriptCore.xcconfig as
its base.
- Move from JavaScriptCore framework target to libJavaScriptCore target:
- Custom Build Rules.
- Compile Sources.
- Target Dependencies.
- Copy Profiling Data build phase script.
- Add target dependency on libJavaScriptCore to JavaScriptCore.
- Add JavaScriptCoreFramework.cpp source file to JavaScriptCore
framework target.
- Remove all items from "Link Binary with Libraries" for JavaScriptCore
and jsc targets (except libedit.dylib on jsc) since this is handled
via OTHER_LDFLAGS in xcconfig files now.
* Source/JavaScriptCore/JavaScriptCoreFramework.cpp: Add.
- Xcode requires at least one source file to compile to link a
framework so create an empty one.

Canonical link: https://commits.webkit.org/270226@main

999fdfb

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim		✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch		✅ 🛠 jsc-mips
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2023-10-26T00:43:34Z

EWS run on previous version of this PR (hash 4ddd321)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	⏳ 🧪 api-mac	✅ 🛠 gtk
	⏳ 🧪 ios-wk2-wpt	~~🧪 mac-wk1~~	~~🧪 gtk-wk2~~
⏳ 🛠 🧪 jsc	⏳ 🧪 api-ios	~~🧪 mac-wk2~~	~~🧪 api-gtk~~
✅ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim		✅ 🧪 jsc-armv7-tests
	⏳ 🛠 watch		✅ 🛠 jsc-mips
	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

Source/JavaScriptCore/empty.cpp

webkit-early-warning-system · 2023-10-26T01:43:19Z

EWS run on previous version of this PR (hash 52c04d1)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	⏳ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	⏳ 🧪 api-mac	✅ 🛠 gtk
	⏳ 🧪 ios-wk2-wpt	~~🧪 mac-wk1~~	~~🧪 gtk-wk2~~
⏳ 🛠 🧪 jsc	⏳ 🧪 api-ios	~~🧪 mac-wk2~~	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim		~~🧪 jsc-armv7-tests~~
	⏳ 🛠 watch		✅ 🛠 jsc-mips
	✅ 🛠 watch-sim		~~🧪 jsc-mips-tests~~

Source/JavaScriptCore/Configurations/Base-JavaScriptCore.xcconfig

Source/JavaScriptCore/Configurations/libJavaScriptCore.xcconfig

webkit-early-warning-system · 2023-10-26T02:15:02Z

EWS run on previous version of this PR (hash 11c3a5b)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim		✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch		✅ 🛠 jsc-mips
	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

ddkilzer · 2023-10-30T17:15:40Z

Updated PR to include feedback from @emw-apple.

webkit-early-warning-system · 2023-10-30T17:15:47Z

EWS run on current version of this PR (hash 8478aa3)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
🧪 style	🛠 ios	🛠 mac	🛠 wpe	⏳ 🛠 wincairo
	🛠 ios-sim	🛠 mac-AS-debug	🧪 wpe-wk2
🧪 webkitperl	🧪 ios-wk2	🧪 api-mac	🛠 gtk
	🧪 ios-wk2-wpt	🧪 mac-wk1	🧪 gtk-wk2
⏳ 🛠 🧪 jsc	🧪 api-ios	🧪 mac-wk2	🧪 api-gtk
🛠 🧪 jsc-arm64	🛠 tv	🧪 mac-AS-debug-wk2	⏳ 🛠 jsc-armv7
🧪 services	⏳ 🛠 tv-sim	🧪 mac-wk2-stress	⏳ 🧪 jsc-armv7-tests
	⏳ 🛠 watch		🛠 jsc-mips
	⏳ 🛠 watch-sim		🧪 jsc-mips-tests

webkit-early-warning-system · 2023-10-30T17:15:47Z

EWS run on previous version of this PR (hash 8478aa3)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	❌ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	✅ 🧪 mac-wk2	❌ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim		✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch		✅ 🛠 jsc-mips
	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

emw-apple

r+ with a couple fixups. Looks great!

Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

Source/JavaScriptCore/API/JSWrapperMap.h

webkit-early-warning-system · 2023-11-04T03:37:15Z

EWS run on current version of this PR (hash 999fdfb)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🧪 gtk-wk2
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim		✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch		✅ 🛠 jsc-mips
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

https://bugs.webkit.org/show_bug.cgi?id=263697 <rdar://113641596> Reviewed by Elliott Williams. This change introduces a libJavaScriptCore.a target, which is then used to link JavaScriptCore.framework. By configuring the project to build this way, there is no need to duplicate the list of sources between both targets. When JSC_USE_STATIC_LINKING=YES, the jsc binary is linked to libJavaScriptCore.a instead of to JavaScriptCore.framework. * Source/JavaScriptCore/API/JSWrapperMap.h: * Source/JavaScriptCore/API/ObjCCallbackFunction.h: - Fix header include paths to work with static library. * Source/JavaScriptCore/Configurations/BaseTarget.xcconfig: Copy from Source/JavaScriptCore/Configurations/JSC.xcconfig. - Extract common variables from JavaScriptCore.xcconfig that are shared with libJavaScriptCore.xcconfig. * Source/JavaScriptCore/Configurations/Base.xcconfig: - Extract linker variables from JavaScriptCore.xcconfig that are shared with JSC.xcconfig. - Note that `-fobjc-link-runtime` replaces `-lobjc -framework CoreFoundation -framework Foundation`. * Source/JavaScriptCore/Configurations/JSC.xcconfig: (JSC_USE_STATIC_LINKING): Add. - Set to the same boolean value as ENABLE_LIBFUZZER (which will default to NO), but make it a separate variable to allow this behavior to be overriden via xcodebuild. - Configure OTHER_LDFLAGS to statically link libJavaScriptCore.a when JSC_USE_STATIC_LINKING=YES, else use dynamic linking (default) to JavaScriptCore.framework. * Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig: - Extract shared variables into BaseTarget.xcconfig. - Move build related variables into libJavaScriptCore.xcconfig. * Source/JavaScriptCore/Configurations/libJavaScriptCore.xcconfig: Add. - Move build-related variables from JavaScriptCore.xcconfig. * Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj: - Add new xcconfig files to project. - Add libJavaScriptCore.a target and use libJavaScriptCore.xcconfig as its base. - Move from JavaScriptCore framework target to libJavaScriptCore target: - Custom Build Rules. - Compile Sources. - Target Dependencies. - Copy Profiling Data build phase script. - Add target dependency on libJavaScriptCore to JavaScriptCore. - Add JavaScriptCoreFramework.cpp source file to JavaScriptCore framework target. - Remove all items from "Link Binary with Libraries" for JavaScriptCore and jsc targets (except libedit.dylib on jsc) since this is handled via OTHER_LDFLAGS in xcconfig files now. * Source/JavaScriptCore/JavaScriptCoreFramework.cpp: Add. - Xcode requires at least one source file to compile to link a framework so create an empty one. Canonical link: https://commits.webkit.org/270226@main

webkit-commit-queue · 2023-11-04T10:26:41Z

Committed 270226@main (3d73290): https://commits.webkit.org/270226@main

Reviewed commits have been landed. Closing PR #19575 and removing active labels.

ddkilzer requested a review from a team as a code owner October 26, 2023 00:43

ddkilzer self-assigned this Oct 26, 2023

ddkilzer added the JavaScriptCore For bugs in JavaScriptCore, the JS engine used by WebKit, other than kxmlcore issues. label Oct 26, 2023

kmiller68 reviewed Oct 26, 2023

View reviewed changes

Source/JavaScriptCore/empty.cpp Outdated Show resolved Hide resolved

ddkilzer force-pushed the eng/Build-static-library-for-JavaScriptCore-before-linking-framework branch from 4ddd321 to 52c04d1 Compare October 26, 2023 01:43

ddkilzer requested a review from kmiller68 October 26, 2023 01:46

emw-apple self-requested a review October 26, 2023 02:04

emw-apple reviewed Oct 26, 2023

View reviewed changes

Source/JavaScriptCore/Configurations/Base-JavaScriptCore.xcconfig Outdated Show resolved Hide resolved

Source/JavaScriptCore/Configurations/libJavaScriptCore.xcconfig Outdated Show resolved Hide resolved

ddkilzer force-pushed the eng/Build-static-library-for-JavaScriptCore-before-linking-framework branch from 52c04d1 to 11c3a5b Compare October 26, 2023 02:14

ddkilzer requested review from emw-apple and removed request for kmiller68 October 26, 2023 03:08

ddkilzer force-pushed the eng/Build-static-library-for-JavaScriptCore-before-linking-framework branch from 11c3a5b to 8478aa3 Compare October 30, 2023 17:15

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 30, 2023

emw-apple approved these changes Oct 31, 2023

View reviewed changes

Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj Show resolved Hide resolved

Source/JavaScriptCore/API/JSWrapperMap.h Outdated Show resolved Hide resolved

ddkilzer removed the merging-blocked Applied to prevent a change from being merged label Nov 4, 2023

ddkilzer force-pushed the eng/Build-static-library-for-JavaScriptCore-before-linking-framework branch from 8478aa3 to 999fdfb Compare November 4, 2023 03:36

ddkilzer added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Nov 4, 2023

webkit-commit-queue force-pushed the eng/Build-static-library-for-JavaScriptCore-before-linking-framework branch from 999fdfb to 3d73290 Compare November 4, 2023 10:26

webkit-commit-queue merged commit 3d73290 into WebKit:main Nov 4, 2023

webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Nov 4, 2023

ddkilzer deleted the eng/Build-static-library-for-JavaScriptCore-before-linking-framework branch November 4, 2023 10:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Build static library for JavaScriptCore before linking framework #19575

Build static library for JavaScriptCore before linking framework #19575

ddkilzer commented Oct 26, 2023 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Oct 26, 2023 •

edited

webkit-early-warning-system commented Oct 26, 2023 •

edited

webkit-early-warning-system commented Oct 26, 2023 •

edited

ddkilzer commented Oct 30, 2023

webkit-early-warning-system commented Oct 30, 2023 •

edited

webkit-early-warning-system commented Oct 30, 2023 •

edited

emw-apple left a comment

webkit-early-warning-system commented Nov 4, 2023 •

edited

webkit-commit-queue commented Nov 4, 2023

Build static library for JavaScriptCore before linking framework #19575

Build static library for JavaScriptCore before linking framework #19575

Conversation

ddkilzer commented Oct 26, 2023 • edited by webkit-early-warning-system

3d73290

webkit-early-warning-system commented Oct 26, 2023 • edited

webkit-early-warning-system commented Oct 26, 2023 • edited

webkit-early-warning-system commented Oct 26, 2023 • edited

ddkilzer commented Oct 30, 2023

webkit-early-warning-system commented Oct 30, 2023 • edited

webkit-early-warning-system commented Oct 30, 2023 • edited

emw-apple left a comment

Choose a reason for hiding this comment

webkit-early-warning-system commented Nov 4, 2023 • edited

webkit-commit-queue commented Nov 4, 2023

ddkilzer commented Oct 26, 2023 •

edited by webkit-early-warning-system

`3d73290`

webkit-early-warning-system commented Oct 26, 2023 •

edited

webkit-early-warning-system commented Oct 26, 2023 •

edited

webkit-early-warning-system commented Oct 26, 2023 •

edited

webkit-early-warning-system commented Oct 30, 2023 •

edited

webkit-early-warning-system commented Oct 30, 2023 •

edited

webkit-early-warning-system commented Nov 4, 2023 •

edited