Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit bfa60d5

Browse filesBrowse files
codebytereaduh95
codebytere
authored and
aduh95
committed
build: fix GN for new merve dep
PR-URL: #61984 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 2395fc0 commit bfa60d5
Copy full SHA for bfa60d5

4 files changed

+35-2Lines changed: 35 additions & 2 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎deps/merve/BUILD.gn‎

Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
##############################################################################
2+
# #
3+
# DO NOT EDIT THIS FILE! #
4+
# #
5+
##############################################################################
6+
7+
# This file is used by GN for building, which is NOT the build system used for
8+
# building official binaries.
9+
# Please modify the gyp files if you are making changes to build system.
10+
11+
import("unofficial.gni")
12+
13+
merve_gn_build("merve") {
14+
}
Collapse file

‎deps/merve/unofficial.gni‎

Copy file name to clipboard
+20Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# This file is used by GN for building, which is NOT the build system used for
2+
# building official binaries.
3+
# Please edit the gyp files if you are making changes to build system.
4+
5+
# The actual configurations are put inside a template in unofficial.gni to
6+
# prevent accidental edits from contributors.
7+
template("merve_gn_build") {
8+
config("merve_config") {
9+
include_dirs = [ "." ]
10+
}
11+
gypi_values = exec_script("../../tools/gypi_to_gn.py",
12+
[ rebase_path("merve.gyp") ],
13+
"scope",
14+
[ "merve.gyp" ])
15+
source_set(target_name) {
16+
forward_variables_from(invoker, "*")
17+
public_configs = [ ":merve_config" ]
18+
sources = gypi_values.merve_sources
19+
}
20+
}
Collapse file

‎node.gni‎

Copy file name to clipboardExpand all lines: node.gni
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ declare_args() {
2626
# TODO(zcbenz): This is currently copied from configure.py, we should share
2727
# the list between configure.py and GN configurations.
2828
node_builtin_shareable_builtins = [
29-
"deps/cjs-module-lexer/lexer.js",
30-
"deps/cjs-module-lexer/dist/lexer.js",
3129
"deps/undici/undici.js",
3230
"deps/amaro/dist/index.js",
3331
]
Collapse file

‎unofficial.gni‎

Copy file name to clipboardExpand all lines: unofficial.gni
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ template("node_gn_build") {
160160
"deps/cares",
161161
"deps/histogram",
162162
"deps/llhttp",
163+
"deps/merve",
163164
"deps/nbytes",
164165
"deps/nghttp2",
165166
"deps/ngtcp2",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.