Browse Source

Use full path to link to libv8.a and libudns.a

Previously was linking just by doing -lv8 or -ludns which could confuse the
build when a system libv8 or libudns was installed.
v0.7.4-release
Ryan Dahl 15 years ago
parent
commit
fc937aa3e5
  1. 21
      wscript

21
wscript

@ -172,19 +172,16 @@ def build_udns(bld):
) )
bld.env["CPPPATH_UDNS"] = "deps/udns" bld.env["CPPPATH_UDNS"] = "deps/udns"
bld.env["STATICLIB_UDNS"] = "udns" t = join(bld.srcnode.abspath(bld.env_of_name("default")), default.target)
bld.env_of_name('default')["LINKFLAGS_UDNS"] = [t]
bld.env_of_name('default')["STATICLIB_UDNS"] = "udns"
bld.env_of_name('default')["LIBPATH_UDNS"] = default_dir
if bld.env["USE_DEBUG"]: if bld.env["USE_DEBUG"]:
debug_build_dir = bld.srcnode.abspath(bld.env_of_name("debug")) debug_build_dir = bld.srcnode.abspath(bld.env_of_name("debug"))
debug_dir = join(debug_build_dir, "deps/udns") debug_dir = join(debug_build_dir, "deps/udns")
debug = default.clone("debug") debug = default.clone("debug")
debug.rule = rule % debug_dir debug.rule = rule % debug_dir
#debug.target = join(debug_dir, static_lib) t = join(bld.srcnode.abspath(bld.env_of_name("debug")), debug.target)
bld.env_of_name('debug')["STATICLIB_UDNS"] = "udns" bld.env_of_name('debug')["LINKFLAGS_UDNS"] = [t]
bld.env_of_name('debug')["LIBPATH_UDNS"] = debug_dir
bld.install_files('${PREFIX}/include/node/', 'deps/udns/udns.h') bld.install_files('${PREFIX}/include/node/', 'deps/udns/udns.h')
def v8_cmd(bld, variant): def v8_cmd(bld, variant):
@ -230,9 +227,8 @@ def build_v8(bld):
) )
v8.uselib = "EXECINFO" v8.uselib = "EXECINFO"
bld.env["CPPPATH_V8"] = "deps/v8/include" bld.env["CPPPATH_V8"] = "deps/v8/include"
bld.env_of_name('default')["STATICLIB_V8"] = "v8" t = join(bld.srcnode.abspath(bld.env_of_name("default")), v8.target)
bld.env_of_name('default')["LINKFLAGS_V8"] = ["-pthread"] bld.env_of_name('default')["LINKFLAGS_V8"] = ["-pthread", t]
bld.env_of_name('default')["LIBPATH_V8"] = bld.srcnode.abspath(bld.env_of_name("default"))
### v8 debug ### v8 debug
if bld.env["USE_DEBUG"]: if bld.env["USE_DEBUG"]:
@ -240,9 +236,8 @@ def build_v8(bld):
v8_debug.rule = v8_cmd(bld, "debug") v8_debug.rule = v8_cmd(bld, "debug")
v8_debug.target = bld.env["staticlib_PATTERN"] % "v8_g" v8_debug.target = bld.env["staticlib_PATTERN"] % "v8_g"
v8_debug.uselib = "EXECINFO" v8_debug.uselib = "EXECINFO"
bld.env_of_name('debug')["STATICLIB_V8"] = "v8_g" t = join(bld.srcnode.abspath(bld.env_of_name("debug")), v8_debug.target)
bld.env_of_name('debug')["LINKFLAGS_V8"] = ["-pthread"] bld.env_of_name('debug')["LINKFLAGS_V8"] = ["-pthread", t]
bld.env_of_name('debug')["LIBPATH_V8"] = bld.srcnode.abspath(bld.env_of_name("debug"))
bld.install_files('${PREFIX}/include/node/', 'deps/v8/include/*.h') bld.install_files('${PREFIX}/include/node/', 'deps/v8/include/*.h')

Loading…
Cancel
Save