Merge branch 'master' into v2.1

2 files changed, 4 insertions, 1 deletions

diff --git a/src/lib_os.c b/src/lib_os.c
index 7b5873a5..37d7d5be 100644
--- a/src/lib_os.c
+++ b/src/lib_os.c
@@ -39,7 +39,7 @@
 
 LJLIB_CF(os_execute)
 {
-#if LJ_TARGET_CONSOLE
+#if LJ_NO_SYSTEM
 #if LJ_52
   errno = ENOSYS;
   return luaL_fileresult(L, 0, NULL);
diff --git a/src/lj_arch.h b/src/lj_arch.h
index b72dbcca..c66a11c8 100644
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -498,6 +498,9 @@
 #if defined(__symbian__) || LJ_TARGET_WINDOWS
 #define LUAJIT_NO_EXP2
 #endif
+#if LJ_TARGET_CONSOLE || (LJ_TARGET_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_8_0)
+#define LJ_NO_SYSTEM            1
+#endif
 
 #if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3 || LJ_TARGET_PS4
 #define LJ_NO_UNWIND            1