[Openmp-commits] [openmp] r243021 - Merging r243017:

[Hans Wennborg]

Author: hans
Date: Thu Jul 23 10:57:47 2015
New Revision: 243021

URL: http://llvm.org/viewvc/llvm-project?rev=243021&view=rev
Log:
Merging r243017:
------------------------------------------------------------------------
r243017 | jlpeyton | 2015-07-23 07:41:35 -0700 (Thu, 23 Jul 2015) | 12 lines

[CMake] Fix libomp_check_linker_flag function

libomp_check_linker_flag rewrites src_to_link.c and CMakeLists.txt in build
directory for test project, but cmake does not rebuild the project. The root
cause is that on some filesystems (ext3, reiserfs) timestamp resoultion is 1
second. So cmake does not rebuild test project if check takes less than 1 second.
This patch puts each test in its own directory to avoid the timestamp problem.

Patch by Chris Bergstrom

http://lists.cs.uiuc.edu/pipermail/openmp-dev/2015-July/000817.html

------------------------------------------------------------------------

Modified:
    openmp/branches/release_37/   (props changed)
    openmp/branches/release_37/runtime/cmake/LibompCheckLinkerFlag.cmake

Propchange: openmp/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 23 10:57:47 2015
@@ -1 +1 @@
-/openmp/trunk:242285,242298,242301,242604
+/openmp/trunk:242285,242298,242301,242604,243017

Modified: openmp/branches/release_37/runtime/cmake/LibompCheckLinkerFlag.cmake
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_37/runtime/cmake/LibompCheckLinkerFlag.cmake?rev=243021&r1=243020&r2=243021&view=diff
==============================================================================
--- openmp/branches/release_37/runtime/cmake/LibompCheckLinkerFlag.cmake (original)
+++ openmp/branches/release_37/runtime/cmake/LibompCheckLinkerFlag.cmake Thu Jul 23 10:57:47 2015
@@ -23,7 +23,7 @@ function(libomp_check_linker_flag flag b
      set(CMAKE_SHARED_LINKER_FLAGS \"${flag}\")
      add_library(foo SHARED src_to_link.c)")
   set(failed_regexes "[Ee]rror;[Uu]nknown;[Ss]kipping;LINK : warning")
-  set(base_dir ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/link_flag_check)
+  set(base_dir ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/link_flag_check_${boolean})
   file(MAKE_DIRECTORY ${base_dir})
   file(MAKE_DIRECTORY ${base_dir}/build)
   file(WRITE ${base_dir}/src_to_link.c "${library_source}")