Skip to content

Commit

Permalink
Merge pull request #618 from sergiud/ac_cv___attribute___printf_4_5
Browse files Browse the repository at this point in the history
build: set ac_cv___attribute___printf_4_5
  • Loading branch information
sergiud authored Mar 31, 2021
2 parents d5fdcfe + b442ef8 commit d66e593
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ set (ac_google_start_namespace ${_START_GOOGLE_NAMESPACE_})
if (HAVE___ATTRIBUTE__)
set (ac_cv___attribute___noreturn "__attribute__((noreturn))")
set (ac_cv___attribute___noinline "__attribute__((noinline))")
set (ac_cv___attribute___printf_4_5 "__attribute__((__format__(__printf__, 4, 5)))")
elseif (HAVE___DECLSPEC)
set (ac_cv___attribute___noreturn "__declspec(noreturn)")
#set (ac_cv___attribute___noinline "__declspec(noinline)")
Expand Down
2 changes: 1 addition & 1 deletion bazel/glog.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ sed -e 's/@ac_cv_cxx_using_operator@/1/g' \
-e 's/@ac_google_namespace@/google/g' \
-e 's/@ac_cv___attribute___noinline@/__attribute__((noinline))/g' \
-e 's/@ac_cv___attribute___noreturn@/__attribute__((noreturn))/g' \
-e 's/@ac_cv___attribute___printf_4_5@/__attribute__((__format__ (__printf__, 4, 5)))/g'
-e 's/@ac_cv___attribute___printf_4_5@/__attribute__((__format__(__printf__, 4, 5)))/g'
EOF
'''.format(int(with_gflags)),
)
Expand Down

0 comments on commit d66e593

Please sign in to comment.