GYP : Fix link issue with unit-tests

nidium · Apr 28, 2017 · d011cf4 · d011cf4
1 parent 2a8998d
commit d011cf4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 27 deletions.
diff --git a/gyp/network-unittests.gyp b/gyp/network-unittests.gyp
@@ -43,6 +43,16 @@
         'conditions': [
             ['OS=="mac"', {
                 'product_dir': '<(libapenetwork_tests_output_path)',
+                "xcode_settings": {
+                    'OTHER_LDFLAGS!': [
+                        '../build/third-party/libssl.a',
+                        '../build/third-party/libcrypto.a',
+                    ],
+                    'OTHER_LDFLAGS': [
+                        '<(DEPTH)/build/third-party/libssl.a',
+                        '<(DEPTH)/build/third-party/libcrypto.a',
+                    ],
+                },
             }, {
                 'product_dir': '../build/tests/',
             }]
@@ -70,30 +80,6 @@
             '../tests/unittest_websocket.cpp',
             '../tests/unittest_log.cpp',
         ],
-    },
-    {
-        'target_name': 'network_benchmark_new_pool',
-        'type': 'executable',
-        'product_dir': '<(libapenetwork_tests_output_path)',
-        'dependencies': [
-            'network-unittests.gyp:unittests-settings',
-            'network.gyp:*',
-        ],
-        'sources': [
-            '../tests/benchmark_new_pool.c',
-        ],
-    },
-    {
-        'target_name': 'network_benchmark_timers_next',
-        'type': 'executable',
-        'product_dir': '<(libapenetwork_tests_output_path)',
-        'dependencies': [
-            'network-unittests.gyp:unittests-settings',
-            'network.gyp:*',
-        ],
-        'sources': [
-            '../tests/benchmark_timers_next.c',
-        ],
     }]
 }
 
diff --git a/gyp/network.gyp b/gyp/network.gyp
@@ -56,9 +56,9 @@
                             'libz.a'
                         ]
                     },
-                    # clang will linking with libssl from Xcode. Gyp does not
-                    # support providing paths in link_settings/librairies, we
-                    # provide libssl and libcrypto link option trough LDFLAGS
+                    # clang will link with libssl from Xcode. But GYP does not
+                    # support providing paths in link_settings/librairies, so we
+                    # need provide libssl and libcrypto link option trough LDFLAGS
                     "xcode_settings": {
                         'OTHER_LDFLAGS': [
                             '../build/third-party/libssl.a',