summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--wscript6
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a520beaf..dae14d6b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,11 +2,11 @@
* Feature: Improved addon builds with node-waf
- * Feature: node.SignalHandler (Brandon Beacher)
+ * Feature: node.SignalHandler (Brandon Beacher)
- * Feature: Enable V8 debugging (but still need to make a debugger)
+ * Feature: Enable V8 debugging (but still need to make a debugger)
- * API: Rename library /utils.js to /sys.js
+ * API: Rename library /utils.js to /sys.js
* Clean up Node's build system
@@ -20,7 +20,7 @@
* API: Remove include() add node.mixin()
- * Normalize http headers; "Content-Length" becomes "content-length"
+ * Normalize http headers; "Content-Length" becomes "content-length"
* Upgrade V8 to 1.3.15
diff --git a/wscript b/wscript
index 4c535fc7e..27dcb451f 100644
--- a/wscript
+++ b/wscript
@@ -116,8 +116,8 @@ def configure(conf):
#if Options.options.efence:
# conf.check(lib='efence', libpath=['/usr/lib', '/usr/local/lib'], uselib_store='EFENCE')
- if sys.platform.startswith("freebsd"):
- if not conf.check(lib="execinfo", libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"):
+ if not conf.check(lib="execinfo", libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"):
+ if sys.platform.startswith("freebsd"):
fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.")
conf.sub_config('deps/libeio')
@@ -235,6 +235,7 @@ def build_v8(bld):
before = "cxx",
install_path = None
)
+ v8.uselib = "EXECINFO"
bld.env["CPPPATH_V8"] = "deps/v8/include"
bld.env_of_name('default')["STATICLIB_V8"] = "v8"
bld.env_of_name('default')["LINKFLAGS_V8"] = ["-pthread"]
@@ -244,6 +245,7 @@ def build_v8(bld):
v8_debug = v8.clone("debug")
v8_debug.rule = v8_cmd(bld, "debug")
v8_debug.target = bld.env["staticlib_PATTERN"] % "v8_g"
+ v8_debug.uselib = "EXECINFO"
bld.env_of_name('debug')["STATICLIB_V8"] = "v8_g"
bld.env_of_name('debug')["LINKFLAGS_V8"] = ["-pthread"]