Skip to content

Commit 67bea3d

Browse files
committed
always bundle static libzmq
never look for it elsewhere on the system
1 parent 07ee818 commit 67bea3d

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

binding.gyp

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,19 @@
3232
}
3333
},
3434
}, {
35-
'libraries': [ '<!@(pkg-config libzmq --variable=libdir)/libzmq.a' ],
35+
'libraries': [ '<(PRODUCT_DIR)/../../zmq/lib/libzmq.a' ],
36+
'include_dirs': [ '<(PRODUCT_DIR)/../../zmq/include' ],
3637
'cflags!': ['-fno-exceptions'],
3738
'cflags_cc!': ['-fno-exceptions'],
3839
}],
3940
['OS=="mac" or OS=="solaris"', {
4041
'xcode_settings': {
4142
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
4243
},
43-
# add macports include & lib dirs, homebrew include & lib dirs
44-
'include_dirs': [
45-
'<!@(pkg-config libzmq --cflags-only-I | sed s/-I//g)',
46-
'/opt/local/include',
47-
'/usr/local/include',
48-
],
49-
'libraries': [
50-
'-L/opt/local/lib',
51-
'-L/usr/local/lib',
52-
]
5344
}],
5445
['OS=="openbsd" or OS=="freebsd"', {
55-
'include_dirs': [
56-
'<!@(pkg-config libzmq --cflags-only-I | sed s/-I//g)',
57-
'/usr/local/include',
58-
]
5946
}],
6047
['OS=="linux"', {
61-
'cflags': [
62-
'<!(pkg-config libzmq --cflags 2>/dev/null || echo "")',
63-
],
6448
}],
6549
]
6650
}

0 commit comments

Comments
 (0)