Remove defined of __{DATE,TIMESTAMP,TIME}__ Intel groks on using these on cmd line. Åke Sandgren, 20180810 diff -ru bazel.orig/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL bazel/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL --- bazel.orig/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL 1980-01-01 00:00:00.000000000 +0100 +++ bazel/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL 2018-08-10 20:29:25.149401707 +0200 @@ -91,9 +91,6 @@ # Make C++ compilation deterministic. Use linkstamping instead of these # compiler symbols. unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" # Security hardening on by default. # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. diff -ru bazel.orig/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL bazel/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL --- bazel.orig/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL 1980-01-01 00:00:00.000000000 +0100 +++ bazel/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL 2018-08-10 20:29:25.149401707 +0200 @@ -99,9 +99,6 @@ # Make C++ compilation deterministic. Use linkstamping instead of these # compiler symbols. unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" # Security hardening on by default. # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. @@ -202,9 +199,6 @@ target_system_name: "local" unfiltered_cxx_flag: "-fno-canonical-system-headers" unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" tool_path {name: "ar" path: "/usr/bin/ar" } tool_path {name: "cpp" path: "/usr/bin/cpp" } tool_path {name: "dwp" path: "/usr/bin/dwp" } diff -ru bazel.orig/tools/cpp/CROSSTOOL bazel/tools/cpp/CROSSTOOL --- bazel.orig/tools/cpp/CROSSTOOL 1980-01-01 00:00:00.000000000 +0100 +++ bazel/tools/cpp/CROSSTOOL 2018-08-10 20:29:25.153401646 +0200 @@ -141,9 +141,6 @@ # Make C++ compilation deterministic. Use linkstamping instead of these # compiler symbols. unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" # Security hardening on by default. # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. @@ -247,9 +244,6 @@ # Make C++ compilation deterministic. Use linkstamping instead of these # compiler symbols. unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" # Security hardening on by default. # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. @@ -352,9 +346,6 @@ # Make C++ compilation deterministic. Use linkstamping instead of these # compiler symbols. unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" # Security hardening on by default. # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. diff -ru bazel.orig/tools/cpp/unix_cc_configure.bzl bazel/tools/cpp/unix_cc_configure.bzl --- bazel.orig/tools/cpp/unix_cc_configure.bzl 1980-01-01 00:00:00.000000000 +0100 +++ bazel/tools/cpp/unix_cc_configure.bzl 2018-08-10 20:31:42.415259408 +0200 @@ -303,9 +303,6 @@ # Make C++ compilation deterministic. Use linkstamping instead of these # compiler symbols. "-Wno-builtin-macro-redefined", - "-D__DATE__=\\\"redacted\\\"", - "-D__TIMESTAMP__=\\\"redacted\\\"", - "-D__TIME__=\\\"redacted\\\"", ], "compiler_flag": [ # Security hardening requires optimization. diff -ru bazel.orig/tools/osx/crosstool/CROSSTOOL.tpl bazel/tools/osx/crosstool/CROSSTOOL.tpl --- bazel.orig/tools/osx/crosstool/CROSSTOOL.tpl 1980-01-01 00:00:00.000000000 +0100 +++ bazel/tools/osx/crosstool/CROSSTOOL.tpl 2018-08-10 20:30:31.184371152 +0200 @@ -153,9 +153,6 @@ builtin_sysroot: "" unfiltered_cxx_flag: "-no-canonical-prefixes" unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" default_python_version: "python2.7" feature { name: "fastbuild" @@ -1768,9 +1765,6 @@ builtin_sysroot: "" unfiltered_cxx_flag: "-no-canonical-prefixes" unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" unfiltered_cxx_flag: "-target" unfiltered_cxx_flag: "x86_64-apple-ios" default_python_version: "python2.7" @@ -3401,9 +3395,6 @@ builtin_sysroot: "" unfiltered_cxx_flag: "-no-canonical-prefixes" unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" unfiltered_cxx_flag: "-target" unfiltered_cxx_flag: "i386-apple-watchos" default_python_version: "python2.7" @@ -5037,9 +5028,6 @@ builtin_sysroot: "" unfiltered_cxx_flag: "-no-canonical-prefixes" unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" unfiltered_cxx_flag: "-target" unfiltered_cxx_flag: "x86_64-apple-tvos" default_python_version: "python2.7" @@ -6700,9 +6688,6 @@ builtin_sysroot: "" unfiltered_cxx_flag: "-no-canonical-prefixes" unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" unfiltered_cxx_flag: "-target" unfiltered_cxx_flag: "i386-apple-ios" default_python_version: "python2.7" @@ -8333,9 +8318,6 @@ builtin_sysroot: "" unfiltered_cxx_flag: "-no-canonical-prefixes" unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" unfiltered_cxx_flag: "-target" unfiltered_cxx_flag: "armv7-apple-ios" default_python_version: "python2.7" @@ -9954,9 +9936,6 @@ builtin_sysroot: "" unfiltered_cxx_flag: "-no-canonical-prefixes" unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" unfiltered_cxx_flag: "-target" unfiltered_cxx_flag: "armv7k-apple-watchos" default_python_version: "python2.7" @@ -11578,9 +11557,6 @@ builtin_sysroot: "" unfiltered_cxx_flag: "-no-canonical-prefixes" unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" unfiltered_cxx_flag: "-target" unfiltered_cxx_flag: "arm64-apple-tvos" default_python_version: "python2.7" @@ -13229,9 +13205,6 @@ builtin_sysroot: "" unfiltered_cxx_flag: "-no-canonical-prefixes" unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" unfiltered_cxx_flag: "-target" unfiltered_cxx_flag: "arm64-apple-ios" default_python_version: "python2.7" @@ -14850,9 +14823,6 @@ builtin_sysroot: "" unfiltered_cxx_flag: "-no-canonical-prefixes" unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" supports_start_end_lib: false default_python_version: "python2.7" supports_interface_shared_objects: false