diff options
| author | Yihong Wang <yh.wang@ibm.com> | 2017-12-04 16:07:53 -0800 |
|---|---|---|
| committer | Joyee Cheung <joyeec9h3@gmail.com> | 2018-01-17 11:34:28 +0800 |
| commit | f878f9414eb6c7ef1d166404ae43444826706db8 (patch) | |
| tree | c5ff1021bb6d91ee6333003b572780dc834cd3a8 /test/addons/openssl-binding | |
| parent | cd60c7db5fe04c6a53b7dd8784ad0b52af30958d (diff) | |
| download | android-node-v8-f878f9414eb6c7ef1d166404ae43444826706db8.tar.gz android-node-v8-f878f9414eb6c7ef1d166404ae43444826706db8.tar.bz2 android-node-v8-f878f9414eb6c7ef1d166404ae43444826706db8.zip | |
build: refine static and shared lib build
Refine the static and shared lib build process in order
to integrate static and shared lib verfication into CI.
When building both static and shared lib, we still build
node executable now and it uses the shared and static lib.
Signed-off-by: Yihong Wang <yh.wang@ibm.com>
Fixes: https://github.com/nodejs/node/issues/14158
PR-URL: https://github.com/nodejs/node/pull/17604
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Diffstat (limited to 'test/addons/openssl-binding')
| -rw-r--r-- | test/addons/openssl-binding/binding.gyp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/test/addons/openssl-binding/binding.gyp b/test/addons/openssl-binding/binding.gyp index 425b38caa3..3bfe93350f 100644 --- a/test/addons/openssl-binding/binding.gyp +++ b/test/addons/openssl-binding/binding.gyp @@ -1,8 +1,4 @@ { - 'includes': ['../../../config.gypi'], - 'variables': { - 'node_target_type%': '', - }, 'targets': [ { 'target_name': 'binding', @@ -10,13 +6,6 @@ ['node_use_openssl=="true"', { 'sources': ['binding.cc'], 'include_dirs': ['../../../deps/openssl/openssl/include'], - 'conditions': [ - ['OS=="win" and node_target_type=="static_library"', { - 'libraries': [ - '../../../../$(Configuration)/lib/<(OPENSSL_PRODUCT)' - ], - }], - ], }] ] }, |