mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
electron/patches/common/v8/build_gn.patch

23 lines
559 B
Diff
Raw Normal View History

build: move libcc patches to electron repo (#14104) In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived.
2018-09-14 05:02:16 +00:00
diff --git a/BUILD.gn b/BUILD.gn
build: update electron patches (#14623) * build: remove common/icu/no_inline_default_constructor.patch It was added in https://github.com/electron/libchromiumcontent/pull/207, the issue is no longer valid in the GN build. * build: remove common/icu/build_gn.patch In GN release build all code including node are linked statically in a single binary, the workaround is no longer valid. * build: remove ununsed patches * build: remove is_electron_gn_build arg * build: remove component mode crt config patch * build: remove executable config patch for character_data_generator * build: remove latency_info.patch * build: remove exec_script_whitelist patch * build: update patches/common/v8/build_gn.patch * build: remove common/chromium/fix-arm64-linking-error.patch It was added in https://github.com/electron/libchromiumcontent/pull/473/commits/a1df18ca36587de87ec7128a956241d1c7405869 to workaround a linker issue. * build: remove common/chromium/protobuf_build_gn.patch It was added to workaround a VS linker bug, it has been fixed in Update 1 * build: remove common/chromium/disable-recursive-surface-sync.patch It was added in https://github.com/electron/libchromiumcontent/pull/413/commits/6bc6626e2cf12a629c25b1a7a7537134b09deee0 to fix dcheck on macOS, it no longer appears to be an issue.
2018-09-15 11:40:18 +00:00
index 4b48f7d687..30e9ec34cf 100644
build: move libcc patches to electron repo (#14104) In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived.
2018-09-14 05:02:16 +00:00
--- a/BUILD.gn
+++ b/BUILD.gn
build: update electron patches (#14623) * build: remove common/icu/no_inline_default_constructor.patch It was added in https://github.com/electron/libchromiumcontent/pull/207, the issue is no longer valid in the GN build. * build: remove common/icu/build_gn.patch In GN release build all code including node are linked statically in a single binary, the workaround is no longer valid. * build: remove ununsed patches * build: remove is_electron_gn_build arg * build: remove component mode crt config patch * build: remove executable config patch for character_data_generator * build: remove latency_info.patch * build: remove exec_script_whitelist patch * build: update patches/common/v8/build_gn.patch * build: remove common/chromium/fix-arm64-linking-error.patch It was added in https://github.com/electron/libchromiumcontent/pull/473/commits/a1df18ca36587de87ec7128a956241d1c7405869 to workaround a linker issue. * build: remove common/chromium/protobuf_build_gn.patch It was added to workaround a VS linker bug, it has been fixed in Update 1 * build: remove common/chromium/disable-recursive-surface-sync.patch It was added in https://github.com/electron/libchromiumcontent/pull/413/commits/6bc6626e2cf12a629c25b1a7a7537134b09deee0 to fix dcheck on macOS, it no longer appears to be an issue.
2018-09-15 11:40:18 +00:00
@@ -192,7 +192,7 @@ config("internal_config") {
build: move libcc patches to electron repo (#14104) In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived.
2018-09-14 05:02:16 +00:00
include_dirs = [ "." ]
- if (is_component_build) {
+ if (is_component_build || is_electron_build) {
defines = [ "BUILDING_V8_SHARED" ]
}
}
build: update electron patches (#14623) * build: remove common/icu/no_inline_default_constructor.patch It was added in https://github.com/electron/libchromiumcontent/pull/207, the issue is no longer valid in the GN build. * build: remove common/icu/build_gn.patch In GN release build all code including node are linked statically in a single binary, the workaround is no longer valid. * build: remove ununsed patches * build: remove is_electron_gn_build arg * build: remove component mode crt config patch * build: remove executable config patch for character_data_generator * build: remove latency_info.patch * build: remove exec_script_whitelist patch * build: update patches/common/v8/build_gn.patch * build: remove common/chromium/fix-arm64-linking-error.patch It was added in https://github.com/electron/libchromiumcontent/pull/473/commits/a1df18ca36587de87ec7128a956241d1c7405869 to workaround a linker issue. * build: remove common/chromium/protobuf_build_gn.patch It was added to workaround a VS linker bug, it has been fixed in Update 1 * build: remove common/chromium/disable-recursive-surface-sync.patch It was added in https://github.com/electron/libchromiumcontent/pull/413/commits/6bc6626e2cf12a629c25b1a7a7537134b09deee0 to fix dcheck on macOS, it no longer appears to be an issue.
2018-09-15 11:40:18 +00:00
@@ -2912,6 +2912,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
build: move libcc patches to electron repo (#14104) In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived.
2018-09-14 05:02:16 +00:00
configs = [ ":internal_config" ]
+ configs += [ "//electron/build/config:build_time_executable" ]
+
deps = [
":v8_base",
":v8_init",
Reference in a new issue Copy permalink