summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2018-04-20 16:40:17 +0300
committerKonstantin Käfer <mail@kkaefer.com>2018-05-22 11:17:01 +0200
commitd1a266b3e68d052d1478382795598bf2ff28da6a (patch)
treed303f378e1c959397b23739fbb9b06697da024e5 /platform
parent973aa963f917df2c20a05dfea1b3af7314677e06 (diff)
downloadqtlocation-mapboxgl-d1a266b3e68d052d1478382795598bf2ff28da6a.tar.gz
[node] allow building all ABIs at once
Diffstat (limited to 'platform')
-rw-r--r--platform/macos/config.cmake4
-rw-r--r--platform/node/index.js3
2 files changed, 2 insertions, 5 deletions
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake
index 28573258d9..aa3f17eea1 100644
--- a/platform/macos/config.cmake
+++ b/platform/macos/config.cmake
@@ -154,7 +154,5 @@ macro(mbgl_platform_benchmark)
endmacro()
macro(mbgl_platform_node)
- target_link_libraries(mbgl-node
- PRIVATE "-Wl,-bind_at_load"
- )
+ # Define macro to enable this target on this platform
endmacro()
diff --git a/platform/node/index.js b/platform/node/index.js
index 5944a0a27d..6f6b33058a 100644
--- a/platform/node/index.js
+++ b/platform/node/index.js
@@ -2,9 +2,8 @@
// Shim to wrap req.respond while preserving callback-passing API
-var mbgl = require('../../lib/mapbox_gl_native.node');
+var mbgl = require('../../lib/mbgl-node.abi-' + process.versions.modules);
var constructor = mbgl.Map.prototype.constructor;
-var process = require('process');
var Map = function(options) {
if (!(options instanceof Object)) {