[Openmp-commits] [openmp] r257834 - Merging r257833:

Hans Wennborg via Openmp-commits openmp-commits at lists.llvm.org
Thu Jan 14 15:21:41 PST 2016


Author: hans
Date: Thu Jan 14 17:21:33 2016
New Revision: 257834

URL: http://llvm.org/viewvc/llvm-project?rev=257834&view=rev
Log:
Merging r257833:
------------------------------------------------------------------------
r257833 | hans | 2016-01-14 15:18:20 -0800 (Thu, 14 Jan 2016) | 11 lines

Don't use __DATE__ or __TIME__; it breaks release builds (PR26145)

The release builds are configured to be reproducible, so that the
binaries compare equal between bootstrap iterations. The OpenMP
run-time build was failing like this:

runtime/src/kmp_version.c:108:79: error: expansion of date or time macro is not reproducible [-Werror,-Wdate-time]
char const __kmp_version_build_time[]     = KMP_VERSION_PREFIX "build time: " __DATE__ " " __TIME__;

Figuring as the build currently doesn't set LIBOMP_DATE, it's probably
OK to skip setting the build time here too.
------------------------------------------------------------------------

Modified:
    openmp/branches/release_38/   (props changed)
    openmp/branches/release_38/runtime/src/kmp_version.c

Propchange: openmp/branches/release_38/
------------------------------------------------------------------------------
    svn:mergeinfo = /openmp/trunk:257833

Modified: openmp/branches/release_38/runtime/src/kmp_version.c
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_38/runtime/src/kmp_version.c?rev=257834&r1=257833&r2=257834&view=diff
==============================================================================
--- openmp/branches/release_38/runtime/src/kmp_version.c (original)
+++ openmp/branches/release_38/runtime/src/kmp_version.c Thu Jan 14 17:21:33 2016
@@ -105,7 +105,7 @@ char const __kmp_version_copyright[]
 char const __kmp_version_lib_ver[]        = KMP_VERSION_PREFIX "version: " stringer( KMP_VERSION_MAJOR ) "." stringer( KMP_VERSION_MINOR ) "." stringer( KMP_VERSION_BUILD );
 char const __kmp_version_lib_type[]       = KMP_VERSION_PREFIX "library type: " KMP_LIB_TYPE;
 char const __kmp_version_link_type[]      = KMP_VERSION_PREFIX "link type: " KMP_LINK_TYPE;
-char const __kmp_version_build_time[]     = KMP_VERSION_PREFIX "build time: " __DATE__ " " __TIME__;
+char const __kmp_version_build_time[]     = KMP_VERSION_PREFIX "build time: " "no_timestamp";
 #if KMP_MIC2
     char const __kmp_version_target_env[] = KMP_VERSION_PREFIX "target environment: MIC2";
 #endif




More information about the Openmp-commits mailing list