Skip to content

Commit

Permalink
compile flags
Browse files Browse the repository at this point in the history
node compatibility update
  • Loading branch information
obastemur committed Mar 24, 2015
1 parent d11d844 commit 25b925f
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 deletions.
7 changes: 6 additions & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
['OS != "win" and node_engine_mozilla!=1', {
'v8_postmortem_support': 'true'
}],
['GENERATOR == "ninja" and node_engine_mozilla!=1', {
['(GENERATOR == "ninja" or OS == "mac") and node_engine_mozilla!=1', {
'OBJ_DIR': '<(PRODUCT_DIR)/obj',
'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
}],
Expand Down Expand Up @@ -311,6 +311,11 @@
}],
['OS=="freebsd" and node_use_dtrace=="true"', {
'libraries': [ '-lelf' ],
}],
['OS=="freebsd"', {
'ldflags': [
'-Wl,--export-dynamic',
],
}]
],
}
Expand Down
23 changes: 18 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,15 @@ parser.add_option("--systemtap-includes",
dest="systemtap_includes",
help=optparse.SUPPRESS_HELP)

parser.add_option("--no-ssl2",
parser.add_option("--without-ssl2",
action="store_true",
dest="no_ssl2",
help="Disable OpenSSL v2")
dest="ssl2",
help="Disable SSL v2")

parser.add_option("--without-ssl3",
action="store_true",
dest="ssl3",
help="Disable SSL v3")

parser.add_option("--shared-zlib",
action="store_true",
Expand Down Expand Up @@ -503,6 +508,11 @@ def configure_node(o):
target_arch = options.dest_cpu or host_arch
o['variables']['host_arch'] = host_arch
o['variables']['target_arch'] = target_arch

if target_arch != host_arch and not options.without_snapshot:
o['variables']['want_separate_host_toolset'] = 1
else:
o['variables']['want_separate_host_toolset'] = 0

if target_arch == 'arm':
configure_arm(o)
Expand Down Expand Up @@ -639,8 +649,11 @@ def configure_openssl(o):
if options.without_ssl:
return

if options.no_ssl2:
if options.ssl2:
o['defines'] += ['OPENSSL_NO_SSL2=1']

if options.ssl3:
o['defines'] += ['OPENSSL_NO_SSL3=1']

if options.shared_openssl:
(libs, cflags) = pkg_config('openssl') or ('-lssl -lcrypto', '')
Expand Down Expand Up @@ -751,4 +764,4 @@ else:

gyp_args += args

subprocess.call(gyp_args)
sys.exit(subprocess.call(gyp_args))

0 comments on commit 25b925f

Please sign in to comment.