From 583f2e599962f2664dbaafa0ae98a8d6c1242441 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Thu, 10 Feb 2011 05:24:39 +0100 Subject: [PATCH] Follow-up fix for v8 cygwin build --- deps/v8/src/ia32/macro-assembler-ia32.cc | 2 +- deps/v8/src/platform-cygwin.cc | 1 - wscript | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/deps/v8/src/ia32/macro-assembler-ia32.cc b/deps/v8/src/ia32/macro-assembler-ia32.cc index ee4e3d9cd6..fe4c83d8e8 100644 --- a/deps/v8/src/ia32/macro-assembler-ia32.cc +++ b/deps/v8/src/ia32/macro-assembler-ia32.cc @@ -1196,7 +1196,7 @@ MaybeObject* MacroAssembler::TryTailCallRuntime(Runtime::FunctionId fid, // If false, it is returned as a pointer to a preallocated by caller memory // region. Pointer to this region should be passed to a function as an // implicit first argument. -#if defined(USING_BSD_ABI) || defined(__MINGW32__) +#if defined(USING_BSD_ABI) || defined(__MINGW32__) || defined(__CYGWIN__) static const bool kReturnHandlesDirectly = true; #else static const bool kReturnHandlesDirectly = false; diff --git a/deps/v8/src/platform-cygwin.cc b/deps/v8/src/platform-cygwin.cc index 2516943855..3b015e0f4d 100644 --- a/deps/v8/src/platform-cygwin.cc +++ b/deps/v8/src/platform-cygwin.cc @@ -760,7 +760,6 @@ Sampler::Sampler(int interval) Sampler::~Sampler() { - ASSERT(!data_->signal_sender_launched_); delete data_; } diff --git a/wscript b/wscript index 6ecd979d41..08e0500587 100644 --- a/wscript +++ b/wscript @@ -195,8 +195,8 @@ def configure(conf): o = Options.options conf.env["USE_DEBUG"] = o.debug - # Snapshot building does noet seem to work on mingw32 - conf.env["SNAPSHOT_V8"] = not o.without_snapshot and not sys.platform.startswith("win32") + # Snapshot building does noet seem to work on cygwin and mingw32 + conf.env["SNAPSHOT_V8"] = not o.without_snapshot and not sys.platform.startswith("cygwin") and not sys.platform.startswith("win32") if sys.platform.startswith("sunos"): conf.env["SNAPSHOT_V8"] = False conf.env["USE_PROFILING"] = o.profile