diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76d17ddc..e4a946d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,14 +6,6 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-##
-# Issue:#857.  Use g++ instead of c++ (clang) compiler to eliminate warnings
-if (APPLE)
-    set(CMAKE_C_COMPILER gcc)
-    set(CMAKE_CXX_COMPILER g++)
-endif(APPLE)
-##
-
 ##
 # Running cmake in a tree in which we have run ./configure ; make 
 # creates src/exv_conf.h which conflicts with cmake's own exv_conf.h
diff --git a/src/rcsid_int.hpp b/src/rcsid_int.hpp
index 973f3f5b..3e2f14f4 100644
--- a/src/rcsid_int.hpp
+++ b/src/rcsid_int.hpp
@@ -53,7 +53,7 @@
 
  */
 
-#if defined(__GNUG__) || defined(__GNUC__) || defined (_MSC_VER)
+#if (defined(__GNUG__) || defined(__GNUC__) || defined (_MSC_VER))  && ! defined(__clang__)
 #define EXIV2_RCSID(id) \
     namespace { \
         inline const char* getRcsId(const char*) { return id ; } \