summaryrefslogtreecommitdiff
path: root/node.gypi
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2017-10-16 15:34:42 +0200
committerRuben Bridgewater <ruben@bridgewater.de>2018-02-01 09:51:16 +0100
commitac7f1e339c8043870d6af29191f1bcd3515fc091 (patch)
tree046fdc56ecf1d0e47dd90c32fa89bb9f98fb29e7 /node.gypi
parent936eea5099bb5ab31b76ef22fcf15baed0cdf5ab (diff)
downloadandroid-node-v8-ac7f1e339c8043870d6af29191f1bcd3515fc091.tar.gz
android-node-v8-ac7f1e339c8043870d6af29191f1bcd3515fc091.tar.bz2
android-node-v8-ac7f1e339c8043870d6af29191f1bcd3515fc091.zip
build: make gyp user defined variables lowercase
I mistakenly introduced user defined variables using uppercase characters, reading the gyp documentation they state: "Predefined variables. By convention, these are named with CAPITAL_LETTERS. Predefined variables are set automatically by GYP" and also "By convention, user-defined variables are named with lowercase_letters." This commit renames the user defined variables to lowercase to follow the above mentioned convention. PR-URL: https://github.com/nodejs/node/pull/16238 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'node.gypi')
-rw-r--r--node.gypi14
1 files changed, 7 insertions, 7 deletions
diff --git a/node.gypi b/node.gypi
index 386601906f..49384db0a5 100644
--- a/node.gypi
+++ b/node.gypi
@@ -99,7 +99,7 @@
[ 'force_load=="true"', {
'xcode_settings': {
'OTHER_LDFLAGS': [
- '-Wl,-force_load,<(V8_BASE)',
+ '-Wl,-force_load,<(v8_base)',
],
},
}],
@@ -154,7 +154,7 @@
{
'action_name': 'expfile',
'inputs': [
- '<(OBJ_DIR)'
+ '<(obj_dir)'
],
'outputs': [
'<(PRODUCT_DIR)/node.exp'
@@ -186,13 +186,13 @@
[ '(OS=="freebsd" or OS=="linux") and node_shared=="false"'
' and coverage=="false" and force_load=="true"', {
'ldflags': [ '-Wl,-z,noexecstack',
- '-Wl,--whole-archive <(V8_BASE)',
+ '-Wl,--whole-archive <(v8_base)',
'-Wl,--no-whole-archive' ]
}],
[ '(OS=="freebsd" or OS=="linux") and node_shared=="false"'
' and coverage=="true" and force_load=="true"', {
'ldflags': [ '-Wl,-z,noexecstack',
- '-Wl,--whole-archive <(V8_BASE)',
+ '-Wl,--whole-archive <(v8_base)',
'-Wl,--no-whole-archive',
'--coverage',
'-g',
@@ -237,15 +237,15 @@
[ 'force_load=="true"', {
'xcode_settings': {
'OTHER_LDFLAGS': [
- '-Wl,-force_load,<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)',
+ '-Wl,-force_load,<(PRODUCT_DIR)/<(openssl_product)',
],
},
'conditions': [
['OS in "linux freebsd" and node_shared=="false"', {
'ldflags': [
'-Wl,--whole-archive,'
- '<(OBJ_DIR)/deps/openssl/'
- '<(OPENSSL_PRODUCT)',
+ '<(obj_dir)/deps/openssl/'
+ '<(openssl_product)',
'-Wl,--no-whole-archive',
],
}],