linux-sandbox: don't assume -lrt, -D__STDC_FORMAT_MACROS

Resolves bazelbuild#12327. Closes bazelbuild#12662. PiperOrigin-RevId: 346374211
Bencodes · Dec 8, 2020 · f8606e5 · f8606e5
1 parent ace6652
commit f8606e5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/main/tools/BUILD b/src/main/tools/BUILD
@@ -41,7 +41,11 @@ cc_binary(
     }),
     linkopts = select({
         "//src/conditions:windows": [],
-        "//conditions:default": ["-lm"],
+        "//src/conditions:darwin": ["-lm"],
+        "//conditions:default": [
+            "-lm",
+            "-lrt",
+        ],
     }),
     deps = select({
         "//src/conditions:windows": [],
@@ -86,7 +90,16 @@ cc_binary(
             "linux-sandbox-pid1.h",
         ],
     }),
-    linkopts = ["-lm"],
+    linkopts = select({
+        "//src/conditions:darwin": [],
+        "//src/conditions:freebsd": [],
+        "//src/conditions:openbsd": [],
+        "//src/conditions:windows": [],
+        "//conditions:default": [
+            "-lm",
+            "-lrt",
+        ],
+    }),
     deps = select({
         "//src/conditions:darwin": [],
         "//src/conditions:freebsd": [],

diff --git a/src/main/tools/logging.h b/src/main/tools/logging.h
@@ -15,6 +15,10 @@
 #ifndef SRC_MAIN_TOOLS_LOGGING_H_
 #define SRC_MAIN_TOOLS_LOGGING_H_
 
+// See https://stackoverflow.com/a/8132440 .
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>