squash! build: use PRODUCT_DIR_ABS for MODULESDIR

Author: danbev

common.gypi

@@ -86,19 +86,16 @@
         'os_posix': 0,
         'v8_postmortem_support%': 0,
         'obj_dir': '<(PRODUCT_DIR)/obj',
-        'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
         'v8_base': '<(PRODUCT_DIR)/lib/libv8_snapshot.a',
       }, {
         'os_posix': 1,
         'v8_postmortem_support%': 1,
       }],
       ['GENERATOR == "ninja"', {
         'obj_dir': '<(PRODUCT_DIR)/obj',
-        'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
         'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_snapshot.a',
       }, {
         'obj_dir%': '<(PRODUCT_DIR)/obj.target',
-        'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
         'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_snapshot.a',
       }],
       ['openssl_fips != ""', {
@@ -109,7 +106,6 @@
       ['OS=="mac"', {
         'clang%': 1,
         'obj_dir%': '<(PRODUCT_DIR)/obj.target',
-        'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
         'v8_base': '<(PRODUCT_DIR)/libv8_snapshot.a',
       }],
       ['target_arch in "ppc64 s390x"', {
@@ -567,11 +563,6 @@
           'OPENSSL_NO_ASM',
         ],
       }],
-      ['node_use_openssl=="true"', {
-        'defines': [
-          'MODULESDIR="<(obj_dir_abs)/deps/openssl/lib/openssl-modules"',
-        ],
-      }],
     ],
   }
 }

deps/openssl/openssl.gyp

@@ -4,6 +4,19 @@
     'llvm_version%': '0.0',
     'nasm_version%': '0.0',
     'openssl-cli': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)openssl-cli<(EXECUTABLE_SUFFIX)',
+    'conditions': [
+      ['OS == "win"', {
+        'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
+      }],
+      ['GENERATOR == "ninja"', {
+        'obj_dir_abs': '<(PRODUCT_DIR_ABS)/obj',
+      }, {
+        'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
+      }],
+      ['OS=="mac"', {
+        'obj_dir_abs%': '<(PRODUCT_DIR_ABS)/obj.target',
+      }],
+    ],
   },
   'targets': [
     {
@@ -33,6 +46,12 @@
         }, {
           'includes': ['./openssl_asm_avx2.gypi'],
         }],
+        ['node_shared_openssl=="false"', {
+          'defines': [
+	    'MODULESDIR="<(obj_dir_abs)/deps/openssl/lib/openssl-modules"',
+            'OPENSSLDIR="<(obj_dir_abs)/deps/openssl"',
+          ]
+        }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [ 'openssl/include', 'openssl/crypto/include']

deps/openssl/openssl_common.gypi

@@ -62,7 +62,6 @@
       # linux and others
       'cflags': ['-Wno-missing-field-initializers',],
       'defines': [
-        'OPENSSLDIR="<(obj_dir_abs)/deps/openssl"',
         'ENGINESDIR="/dev/null"',
         'TERMIOS',
       ],