diff options
Diffstat (limited to 'native_client_sdk/src/libraries')
3 files changed, 7 insertions, 2 deletions
diff --git a/native_client_sdk/src/libraries/gtest/library.dsc b/native_client_sdk/src/libraries/gtest/library.dsc index 0660b7c..429f0e9 100644 --- a/native_client_sdk/src/libraries/gtest/library.dsc +++ b/native_client_sdk/src/libraries/gtest/library.dsc @@ -7,7 +7,7 @@ # We can fix this by passing -Wno-unused-private-field to clang, but gcc # doesn't support this flag so we'll have to support splitting CXXFLAGS based # on TOOL first. - 'TOOLS': ['newlib', 'glibc', 'win', 'linux'], + 'TOOLS': ['newlib:x86', 'newlib:x64', 'glibc', 'win', 'linux'], 'SEARCH': [ '.', '../../../../testing/gtest/include/gtest', diff --git a/native_client_sdk/src/libraries/nacl_mounts/kernel_handle.cc b/native_client_sdk/src/libraries/nacl_mounts/kernel_handle.cc index 7eaac84..5103542 100644 --- a/native_client_sdk/src/libraries/nacl_mounts/kernel_handle.cc +++ b/native_client_sdk/src/libraries/nacl_mounts/kernel_handle.cc @@ -8,6 +8,11 @@ #include <fcntl.h> #include <pthread.h> +#ifndef WIN32 +// Needed for SEEK_SET/SEEK_CUR/SEEK_END. +#include <unistd.h> +#endif + #include "nacl_mounts/mount.h" #include "nacl_mounts/mount_node.h" diff --git a/native_client_sdk/src/libraries/nacl_mounts_test/example.dsc b/native_client_sdk/src/libraries/nacl_mounts_test/example.dsc index 03cfa48..894f329 100644 --- a/native_client_sdk/src/libraries/nacl_mounts_test/example.dsc +++ b/native_client_sdk/src/libraries/nacl_mounts_test/example.dsc @@ -1,6 +1,6 @@ { # TODO(binji): pnacl doesn't build right now because gtest doesn't build yet. - 'TOOLS': ['newlib', 'glibc', 'win'], + 'TOOLS': ['newlib:x86', 'newlib:x64', 'glibc', 'win'], # Need to add ../../examples for common.js 'SEARCH': ['.', '../../examples'], |