List:Commits« Previous MessageNext Message »
From:John David Duncan Date:September 27 2011 9:29pm
Subject:bzr push into mysql-5.5-cluster branch (john.duncan:3559 to 3560)
View as plain text  
 3560 John David Duncan	2011-09-27
      Fix syntax error in cmake file

    modified:
      storage/ndb/memcache/atomics.cmake
 3559 John David Duncan	2011-09-27
      part(2) of previous change; use gcc atomics if available

    modified:
      storage/ndb/memcache/atomics.cmake
      storage/ndb/memcache/include/atomics.h
      storage/ndb/memcache/include/ndbmemcache_config.in
=== modified file 'storage/ndb/memcache/atomics.cmake'
--- a/storage/ndb/memcache/atomics.cmake	2011-09-27 19:36:26 +0000
+++ b/storage/ndb/memcache/atomics.cmake	2011-09-27 21:28:33 +0000
@@ -20,9 +20,9 @@ IF(NOT MSVC)
 # we're going to retest using "-march=pentium"
 
 
-  if(${CMAKE_COMPILER_IS_GNUCC} AND NOT ${HAVE_GCC_ATOMIC_BUILTINS})
+  if(CMAKE_COMPILER_IS_GNUCC AND NOT HAVE_GCC_ATOMIC_BUILTINS)
      set(OLD_FLAGS ${CMAKE_REQUIRED_FLAGS})
-     set(CMAKE_REQUIRED_FLAGS ${OLD_FLAGS} -march=pentium)
+     set(CMAKE_REQUIRED_FLAGS "${OLD_FLAGS} -march=pentium")
      CHECK_C_SOURCE_RUNS(
          "int main() {
           volatile int foo= -10; 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (john.duncan:3559 to 3560) John David Duncan2 Oct