From e044aafb92b59063f23efc3a3982b91c745128ff Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Tue, 4 Jun 2013 23:42:35 +0400
Subject: [PATCH] Remove references to Objective C.
---
README.md | 5 ++---
cmake/compiler.cmake | 38 --------------------------------------
doc/user/tutorial.xml | 3 +--
3 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/README.md b/README.md
index 7ffe83f068..1e357593aa 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,8 @@ Caveats:
COMPILATION AND INSTALL
-Tarantool is written in C and Objective C.
-To build, you will need GCC Objective C frontend
-(gcc-objc package on most systems) or Apple CLang compiler.
+Tarantool is written in C and C++.
+To build, you will need GCC or Apple CLang compiler.
CMake is used for configuration management.
3 standard CMake build types are supported:
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index 535cd3a8c1..4dda027c46 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -16,7 +16,6 @@ if (CMAKE_C_COMPILER_ID STREQUAL Clang)
set(CMAKE_COMPILER_IS_GNUCXX OFF)
endif()
-# TODO: clang version is not checked
if(CMAKE_COMPILER_IS_GNUCC)
# gcc and g++ >= 4.5 are supported
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
@@ -77,43 +76,6 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
add_definitions("-DNDEBUG" "-DNVALGRIND")
endif()
-#
-# Enable @try/@catch/@finaly syntax in Objective C code.
-#
-add_compile_flags("OBJC;OBJCXX"
- "-fobjc-exceptions")
-
-#
-# Invoke C++ constructors/destructors in the Objective C class instances.
-#
-add_compile_flags("OBJCXX" "-fobjc-call-cxx-cdtors")
-
-#
-# Assume that all Objective-C message dispatches (e.g., [receiver message:arg])
-# ensure that the receiver is not nil. This allows for more efficient entry
-# points in the runtime to be used
-#
-if (CMAKE_COMPILER_IS_GNUCC)
- add_compile_flags("OBJC;OBJCXX"
- "-fno-nil-receivers")
-endif()
-
-if (CMAKE_COMPILER_IS_CLANG)
- add_compile_flags("OBJC"
- "-fobjc-nonfragile-abi"
- "-fno-objc-legacy-dispatch")
-endif()
-
-if (CMAKE_COMPILER_IS_CLANGXX)
- add_compile_flags("OBJCXX"
- "-fobjc-nonfragile-abi"
- "-fno-objc-legacy-dispatch")
-elseif(CMAKE_COMPILER_IS_GNUCXX)
- # Suppress deprecated warnings in objc/runtime-deprecated.h
- add_compile_flags("OBJCXX"
- " -Wno-deprecated-declarations")
-endif()
-
macro(enable_tnt_compile_flags)
# Tarantool code is written in GNU C dialect.
# Additionally, compile it with more strict flags than the rest
diff --git a/doc/user/tutorial.xml b/doc/user/tutorial.xml
index 41943b1bb0..c28bfebde9 100644
--- a/doc/user/tutorial.xml
+++ b/doc/user/tutorial.xml
@@ -53,8 +53,7 @@
To build Tarantool from source, additionally:
<itemizedlist>
<listitem><para>CMake 2.6 or newer,</para></listitem>
- <listitem><para>GCC 4.4 or newer, with gcc-objc (ObjectiveC)
- language frontend or Clang 3.1 or newer,</para></listitem>
+ <listitem><para>GCC 4.5 or newer or Clang 3.1 or newer,</para></listitem>
<listitem><para>libreadline-dev, when compiling the
command line client.
</para></listitem>
--
GitLab