diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-10-23 16:10:27 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2015-10-28 11:10:22 -0400 |
| commit | 8f7a125ab719157863fc7fc90f783d647a75deeb (patch) | |
| tree | c1a05761fd3659fd505a5c145721f335b8cde96a /src/third_party/wiredtiger | |
| parent | ac1d8c42a498c546fd4f67e19f063776c48ea00e (diff) | |
| download | mongo-8f7a125ab719157863fc7fc90f783d647a75deeb.tar.gz | |
SERVER-21104 WiredTiger no longer compiles on non-x86 platforms
Diffstat (limited to 'src/third_party/wiredtiger')
6 files changed, 10 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript index 71fb130288e..dbff3006239 100644 --- a/src/third_party/wiredtiger/SConscript +++ b/src/third_party/wiredtiger/SConscript @@ -31,6 +31,11 @@ if conf.CheckFunc("sync_file_range"): "HAVE_SYNC_FILE_RANGE" ]) +if conf.CheckCHeader('x86intrin.h'): + env.Append(CPPDEFINES=[ + "HAVE_X86INTRIN_H" + ]) + if env.TargetOSIs('windows'): env.Append(CPPPATH=["build_win"]) env.Append(CFLAGS=[ diff --git a/src/third_party/wiredtiger/build_darwin/wiredtiger_config.h b/src/third_party/wiredtiger/build_darwin/wiredtiger_config.h index fac042ed0ce..58d49ec42e7 100644 --- a/src/third_party/wiredtiger/build_darwin/wiredtiger_config.h +++ b/src/third_party/wiredtiger/build_darwin/wiredtiger_config.h @@ -119,7 +119,7 @@ /* #undef HAVE_VERBOSE */ /* Define to 1 if you have the <x86intrin.h> header file. */ -#define HAVE_X86INTRIN_H 1 +/* #undef HAVE_X86INTRIN_H */ /* Spinlock type from mutex.h. */ #define SPINLOCK_TYPE SPINLOCK_PTHREAD_MUTEX diff --git a/src/third_party/wiredtiger/build_freebsd/wiredtiger_config.h b/src/third_party/wiredtiger/build_freebsd/wiredtiger_config.h index d87f0a54af3..c742e200558 100644 --- a/src/third_party/wiredtiger/build_freebsd/wiredtiger_config.h +++ b/src/third_party/wiredtiger/build_freebsd/wiredtiger_config.h @@ -119,7 +119,7 @@ /* #undef HAVE_VERBOSE */ /* Define to 1 if you have the <x86intrin.h> header file. */ -#define HAVE_X86INTRIN_H 1 +/* #undef HAVE_X86INTRIN_H */ /* Spinlock type from mutex.h. */ #define SPINLOCK_TYPE SPINLOCK_PTHREAD_MUTEX diff --git a/src/third_party/wiredtiger/build_linux/wiredtiger_config.h b/src/third_party/wiredtiger/build_linux/wiredtiger_config.h index 897cb3bcda1..1122e1e319d 100644 --- a/src/third_party/wiredtiger/build_linux/wiredtiger_config.h +++ b/src/third_party/wiredtiger/build_linux/wiredtiger_config.h @@ -119,7 +119,7 @@ /* #undef HAVE_VERBOSE */ /* Define to 1 if you have the <x86intrin.h> header file. */ -#define HAVE_X86INTRIN_H 1 +/* #undef HAVE_X86INTRIN_H */ /* Spinlock type from mutex.h. */ #define SPINLOCK_TYPE SPINLOCK_PTHREAD_MUTEX diff --git a/src/third_party/wiredtiger/build_openbsd/wiredtiger_config.h b/src/third_party/wiredtiger/build_openbsd/wiredtiger_config.h index c4b30b10ec0..b27211419c7 100644 --- a/src/third_party/wiredtiger/build_openbsd/wiredtiger_config.h +++ b/src/third_party/wiredtiger/build_openbsd/wiredtiger_config.h @@ -119,7 +119,7 @@ /* #undef HAVE_VERBOSE */ /* Define to 1 if you have the <x86intrin.h> header file. */ -#define HAVE_X86INTRIN_H 1 +/* #undef HAVE_X86INTRIN_H */ /* Spinlock type from mutex.h. */ #define SPINLOCK_TYPE SPINLOCK_PTHREAD_MUTEX diff --git a/src/third_party/wiredtiger/build_solaris/wiredtiger_config.h b/src/third_party/wiredtiger/build_solaris/wiredtiger_config.h index 383ed7750bb..868b1960cd0 100644 --- a/src/third_party/wiredtiger/build_solaris/wiredtiger_config.h +++ b/src/third_party/wiredtiger/build_solaris/wiredtiger_config.h @@ -119,7 +119,7 @@ /* #undef HAVE_VERBOSE */ /* Define to 1 if you have the <x86intrin.h> header file. */ -#define HAVE_X86INTRIN_H 1 +/* #undef HAVE_X86INTRIN_H */ /* Spinlock type from mutex.h. */ #define SPINLOCK_TYPE SPINLOCK_PTHREAD_MUTEX |