Follow-up fix for v8 cygwin build

nodejs · Feb 10, 2011 · 583f2e5 · 583f2e5
1 parent fd013d1
commit 583f2e5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -760,7 +760,6 @@ Sampler::Sampler(int interval)
 
 
 Sampler::~Sampler() {
-  ASSERT(!data_->signal_sender_launched_);
   delete data_;
 }
 

diff --git 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