mirror of https://gitee.com/bigwinds/arangodb
Darwin fixes
This commit is contained in:
parent
c20cf66e93
commit
b44c7ab64c
|
@ -35,7 +35,15 @@ cat configure.ac \
|
|||
|
||||
mv configure.ac.tmp configure.ac
|
||||
|
||||
./configure --enable-maintainer-mode CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib
|
||||
if [ `uname` == "Darwin" ]; then
|
||||
./configure \
|
||||
--enable-maintainer-mode \
|
||||
CPPFLAGS="-I/usr/local/include -I/usr/local/opt/openssl/include" \
|
||||
LDFLAGS=-L/usr/local/opt/openssl/lib
|
||||
else
|
||||
./configure --enable-maintainer-mode
|
||||
fi
|
||||
|
||||
make built-sources
|
||||
make add-maintainer
|
||||
make add-automagic
|
||||
|
|
|
@ -69,9 +69,11 @@ namespace {
|
|||
CRYPTO_THREADID_set_pointer(id, p);
|
||||
}
|
||||
|
||||
#ifndef __APPLE__
|
||||
template<> inline void setter (CRYPTO_THREADID* id, unsigned long val) {
|
||||
CRYPTO_THREADID_set_numeric(id, val);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void arango_threadid_func (CRYPTO_THREADID *id) {
|
||||
auto self = TRI_CurrentThreadId();
|
||||
|
|
Loading…
Reference in New Issue