start assuming newly cross-platform shared_library location in node-gyp

mapbox · Oct 21, 2021 · 6356cc7 · 6356cc7
1 parent fa143c9
commit 6356cc7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 27 deletions.
diff --git a/test/app4/binding.gyp b/test/app4/binding.gyp
@@ -23,32 +23,13 @@
       "dependencies": [ "<(module_name)" ],
       "copies": [
         {
-          "files": [ "<(PRODUCT_DIR)/<(module_name).node" ],
-          "destination": "<(module_path)/"
+            "files": [ "<(PRODUCT_DIR)/<(module_name).node" ],
+            "destination": "<(module_path)/"
         },
-      ],
-      'conditions': [
-          ['OS == "win"', {
-             "copies": [
-               {
-                "files": [ "<(PRODUCT_DIR)/mylib<(SHARED_LIB_SUFFIX)" ],
-                "destination": "<(module_path)/"
-               }
-             ]
-          }, {
-             "copies": [
-               {
-                "files": [ "<(PRODUCT_DIR)/mylib<(SHARED_LIB_SUFFIX)" ],
-                "destination": "<(module_path)/lib.target/"
-               },
-               # gyp inside node v16 uses -rpath=$ORIGIN/ instead of -rpath=$ORIGIN/lib.target/
-               {
-                "files": [ "<(PRODUCT_DIR)/mylib<(SHARED_LIB_SUFFIX)" ],
-                "destination": "<(module_path)/"
-               }
-             ]
-          }
-          ]
+        {
+            "files": [ "<(PRODUCT_DIR)/mylib<(SHARED_LIB_SUFFIX)" ],
+            "destination": "<(module_path)/"
+        }
       ]
     }
   ]

diff --git a/test/app4/deps/mylib.gyp b/test/app4/deps/mylib.gyp
@@ -14,7 +14,7 @@
               'include_dirs': [ 'include/' ],
             },
             'xcode_settings': {
-              'DYLIB_INSTALL_NAME_BASE': '@loader_path/lib.target/',
+              'DYLIB_INSTALL_NAME_BASE': '@loader_path',
               "MACOSX_DEPLOYMENT_TARGET":"10.9",
               "CLANG_CXX_LIBRARY": "libc++"
             }

diff --git a/test/build.test.js b/test/build.test.js
@@ -52,7 +52,7 @@ const apps = [
     'name': 'app4',
     'args': '',
     'files': {
-      'base': [[localVer, 'app4.node'].join('/'), [localVer, 'lib.target', 'mylib.' + SOEXT].join('/')]
+      'base': [[localVer, 'app4.node'].join('/'), [localVer, 'mylib.' + SOEXT].join('/')]
     }
   },
   {