Skip to content

Commit 88c686e

Browse files
committed
Fix paths in tools/build.py
1 parent 758b8d7 commit 88c686e

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
out
2+
v8.pc

tools/build.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
prebuilt_path = os.path.join(root_path, "prebuilt")
1818
v8_path = os.path.join(root_path, "v8")
1919
out_path = os.path.join(root_path, "out/")
20-
v8build_path = os.path.join(root_path, "out/v8build")
20+
v8build_path = os.path.join(out_path, "v8build")
2121
depot_tools = os.path.join(root_path, "depot_tools")
2222

2323
# To get a list of args
@@ -109,16 +109,16 @@ def Rebuild():
109109
subprocess.check_call([ninja_path, "-v", "-C", v8build_path, "v8_monolith"],
110110
cwd=v8_path,
111111
env=env)
112-
lib_fn = os.path.join(root_path, "out/v8build/obj/libv8_monolith.a")
112+
lib_fn = os.path.join(v8build_path, "obj/libv8_monolith.a")
113113
return lib_fn
114114

115115
def WriteProgramConifgFile(lib_fn):
116116
assert os.path.exists(lib_fn)
117117
if not os.path.isdir(out_path):
118118
os.makedirs(out_path)
119119

120-
pc_fn = os.path.join(root_path, "out/v8.pc")
121-
include_dir = os.path.join(root_path, "v8/include")
120+
pc_fn = os.path.join(root_path, "v8.pc")
121+
include_dir = os.path.join(v8_path, "include")
122122
with open(pc_fn, 'w+') as f:
123123
f.write("Name: v8\n")
124124
f.write("Description: v8\n")
@@ -135,7 +135,7 @@ def EnsureDeps(v8_path):
135135
# gclient needs to have depot_tools in the PATH.
136136
env["PATH"] = depot_tools + os.pathsep + env["PATH"]
137137
subprocess.check_call(["gclient", "sync", "--spec", spec],
138-
cwd=os.path.join(v8_path, os.path.pardir),
138+
cwd=root_path,
139139
env=env)
140140

141141
if __name__ == "__main__":

worker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ package v8worker2
2323

2424
/*
2525
#cgo CXXFLAGS: -std=c++11
26-
#cgo pkg-config: out/v8.pc
26+
#cgo pkg-config: v8.pc
2727
#include <stdlib.h>
2828
#include "binding.h"
2929
*/

0 commit comments

Comments
 (0)