From: Bert Belder Date: Thu, 25 Nov 2010 00:43:33 +0000 (+0100) Subject: Always use statically linked c-ares on windows; fix build X-Git-Tag: v0.3.4~67 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=276b0b174e6a99e9d04b37b898da3b00e7d16ccb;p=platform%2Fupstream%2Fnodejs.git Always use statically linked c-ares on windows; fix build On win32 CARES is always static, so we can call internal functions like ares_inet_pton et al. CARES_STATICLIB must be defined or gcc will try to make DLL stub calls --- diff --git a/wscript b/wscript index 45722d6..87ac736 100644 --- a/wscript +++ b/wscript @@ -282,7 +282,12 @@ def configure(conf): libpath=v8_libpath): conf.fatal("Cannot find v8_g") - if conf.env['USE_SHARED_CARES']: + if sys.platform.startswith("win32"): + # On win32 CARES is always static, so we can call internal functions like ares_inet_pton et al. + # CARES_STATICLIB must be defined or gcc will try to make DLL stub calls + conf.env.append_value('CPPFLAGS', '-DCARES_STATICLIB=1') + conf.sub_config('deps/c-ares') + elif conf.env['USE_SHARED_CARES']: cares_includes = []; if o.shared_cares_includes: cares_includes.append(o.shared_cares_includes); cares_libpath = [];