Skip to content

Commit 583f2e5

Browse files
piscisaureusry
authored andcommitted
Follow-up fix for v8 cygwin build
1 parent fd013d1 commit 583f2e5

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

deps/v8/src/ia32/macro-assembler-ia32.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,7 @@ MaybeObject* MacroAssembler::TryTailCallRuntime(Runtime::FunctionId fid,
11961196
// If false, it is returned as a pointer to a preallocated by caller memory
11971197
// region. Pointer to this region should be passed to a function as an
11981198
// implicit first argument.
1199-
#if defined(USING_BSD_ABI) || defined(__MINGW32__)
1199+
#if defined(USING_BSD_ABI) || defined(__MINGW32__) || defined(__CYGWIN__)
12001200
static const bool kReturnHandlesDirectly = true;
12011201
#else
12021202
static const bool kReturnHandlesDirectly = false;

deps/v8/src/platform-cygwin.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,6 @@ Sampler::Sampler(int interval)
760760

761761

762762
Sampler::~Sampler() {
763-
ASSERT(!data_->signal_sender_launched_);
764763
delete data_;
765764
}
766765

wscript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ def configure(conf):
195195
o = Options.options
196196

197197
conf.env["USE_DEBUG"] = o.debug
198-
# Snapshot building does noet seem to work on mingw32
199-
conf.env["SNAPSHOT_V8"] = not o.without_snapshot and not sys.platform.startswith("win32")
198+
# Snapshot building does noet seem to work on cygwin and mingw32
199+
conf.env["SNAPSHOT_V8"] = not o.without_snapshot and not sys.platform.startswith("cygwin") and not sys.platform.startswith("win32")
200200
if sys.platform.startswith("sunos"):
201201
conf.env["SNAPSHOT_V8"] = False
202202
conf.env["USE_PROFILING"] = o.profile

0 commit comments

Comments
 (0)