@@ -172,19 +172,16 @@ def build_udns(bld):
172
172
)
173
173
174
174
bld .env ["CPPPATH_UDNS" ] = "deps/udns"
175
- bld .env ["STATICLIB_UDNS" ] = "udns"
176
-
177
- bld .env_of_name ('default' )["STATICLIB_UDNS" ] = "udns"
178
- bld .env_of_name ('default' )["LIBPATH_UDNS" ] = default_dir
175
+ t = join (bld .srcnode .abspath (bld .env_of_name ("default" )), default .target )
176
+ bld .env_of_name ('default' )["LINKFLAGS_UDNS" ] = [t ]
179
177
180
178
if bld .env ["USE_DEBUG" ]:
181
179
debug_build_dir = bld .srcnode .abspath (bld .env_of_name ("debug" ))
182
180
debug_dir = join (debug_build_dir , "deps/udns" )
183
181
debug = default .clone ("debug" )
184
182
debug .rule = rule % debug_dir
185
- #debug.target = join(debug_dir, static_lib)
186
- bld .env_of_name ('debug' )["STATICLIB_UDNS" ] = "udns"
187
- bld .env_of_name ('debug' )["LIBPATH_UDNS" ] = debug_dir
183
+ t = join (bld .srcnode .abspath (bld .env_of_name ("debug" )), debug .target )
184
+ bld .env_of_name ('debug' )["LINKFLAGS_UDNS" ] = [t ]
188
185
bld .install_files ('${PREFIX}/include/node/' , 'deps/udns/udns.h' )
189
186
190
187
def v8_cmd (bld , variant ):
@@ -230,19 +227,17 @@ def build_v8(bld):
230
227
)
231
228
v8 .uselib = "EXECINFO"
232
229
bld .env ["CPPPATH_V8" ] = "deps/v8/include"
233
- bld .env_of_name ('default' )["STATICLIB_V8" ] = "v8"
234
- bld .env_of_name ('default' )["LINKFLAGS_V8" ] = ["-pthread" ]
235
- bld .env_of_name ('default' )["LIBPATH_V8" ] = bld .srcnode .abspath (bld .env_of_name ("default" ))
230
+ t = join (bld .srcnode .abspath (bld .env_of_name ("default" )), v8 .target )
231
+ bld .env_of_name ('default' )["LINKFLAGS_V8" ] = ["-pthread" , t ]
236
232
237
233
### v8 debug
238
234
if bld .env ["USE_DEBUG" ]:
239
235
v8_debug = v8 .clone ("debug" )
240
236
v8_debug .rule = v8_cmd (bld , "debug" )
241
237
v8_debug .target = bld .env ["staticlib_PATTERN" ] % "v8_g"
242
238
v8_debug .uselib = "EXECINFO"
243
- bld .env_of_name ('debug' )["STATICLIB_V8" ] = "v8_g"
244
- bld .env_of_name ('debug' )["LINKFLAGS_V8" ] = ["-pthread" ]
245
- bld .env_of_name ('debug' )["LIBPATH_V8" ] = bld .srcnode .abspath (bld .env_of_name ("debug" ))
239
+ t = join (bld .srcnode .abspath (bld .env_of_name ("debug" )), v8_debug .target )
240
+ bld .env_of_name ('debug' )["LINKFLAGS_V8" ] = ["-pthread" , t ]
246
241
247
242
bld .install_files ('${PREFIX}/include/node/' , 'deps/v8/include/*.h' )
248
243
0 commit comments