Skip to content

Commit 82bc25d

Browse files
bnoordhuisry
authored andcommitted
Remove oprofile flags in wscript.
V8 3.1.5 (commit 550f73a) dropped oprofile support so don't pass prof=oprofile to scons. See http://codereview.chromium.org/6474037/ Fixes nodejs#998.
1 parent 8d88c00 commit 82bc25d

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

wscript

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,6 @@ def set_options(opt):
143143
, dest='openssl_libpath'
144144
)
145145

146-
opt.add_option( '--oprofile'
147-
, action='store_true'
148-
, default=False
149-
, help="add oprofile support"
150-
, dest='use_oprofile'
151-
)
152-
153146
opt.add_option( '--gdb'
154147
, action='store_true'
155148
, default=False
@@ -252,12 +245,8 @@ def configure(conf):
252245
conf.env["USE_SHARED_CARES"] = o.shared_cares or o.shared_cares_includes or o.shared_cares_libpath
253246
conf.env["USE_SHARED_LIBEV"] = o.shared_libev or o.shared_libev_includes or o.shared_libev_libpath
254247

255-
conf.env["USE_OPROFILE"] = o.use_oprofile
256248
conf.env["USE_GDBJIT"] = o.use_gdbjit
257249

258-
if o.use_oprofile:
259-
conf.check(lib=['bfd', 'opagent'], uselib_store="OPROFILE")
260-
261250
conf.check(lib='dl', uselib_store='DL')
262251
if not sys.platform.startswith("sunos") and not sys.platform.startswith("cygwin") and not sys.platform.startswith("win32"):
263252
conf.env.append_value("CCFLAGS", "-rdynamic")
@@ -567,12 +556,7 @@ def v8_cmd(bld, variant):
567556
else:
568557
snapshot = ""
569558

570-
if bld.env["USE_OPROFILE"]:
571-
profile = "prof=oprofile"
572-
else:
573-
profile = ""
574-
575-
cmd_R = sys.executable + ' "%s" -j %d -C "%s" -Y "%s" visibility=default mode=%s %s toolchain=%s library=static %s %s'
559+
cmd_R = sys.executable + ' "%s" -j %d -C "%s" -Y "%s" visibility=default mode=%s %s toolchain=%s library=static %s'
576560

577561
cmd = cmd_R % ( scons
578562
, Options.options.jobs
@@ -582,7 +566,6 @@ def v8_cmd(bld, variant):
582566
, arch
583567
, toolchain
584568
, snapshot
585-
, profile
586569
)
587570

588571
if bld.env["USE_GDBJIT"]:

0 commit comments

Comments
 (0)