Upgrade to bazel- 2.2 (sorbet#2740)

* Update to bazel-2.2.0 * Fix some empty object warnings on osx * Format
deborasetton · Mar 4, 2020 · 81d2bb9 · 81d2bb9
1 parent 1196de8
commit 81d2bb9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -69,6 +69,6 @@ gemfile_lock_deps(
     ],
 )
 
-BAZEL_INSTALLER_VERSION_linux_SHA = "2fbdc9c0e3d376697caf0ee3673b7c9475214068c55a01b9744891e131f90b87"
+BAZEL_INSTALLER_VERSION_linux_SHA = "6dfcd3b3d7a8811f53a1776c285cf533bc12c33d1eaf49b6105e9699df26ef57"
 
-BAZEL_INSTALLER_VERSION_darwin_SHA = "c675fa27d99a3114d681db10eb03ded547c40f702b2048c99b8f4ea8e89b9356"
+BAZEL_INSTALLER_VERSION_darwin_SHA = "8a0238c126d086f3641efda177fa8fc1e85ba09c2af10c0977f14b202a9e7a5a"
diff --git a/common/BUILD b/common/BUILD
@@ -1,16 +1,20 @@
 cc_library(
     name = "common",
-    srcs = glob(
+    srcs = [
+        "os/os.h",
+        "os/os.cc",
+    ] + glob(
         [
             "*.cc",
             "*.h",
-            "os/**/*.cc",
-            "os/**/*.h",
         ],
-
         # workaround https://github.com/flycheck/flycheck/issues/248 in emacs
         exclude = ["flycheck_*"],
-    ),
+    ) + select({
+        "//tools/config:darwin": ["os/mac.cc"],
+        "//tools/config:webasm": ["os/emscripten.cc"],
+        "//conditions:default": ["os/linux.cc"],
+    }),
     hdrs = [
         "FileOps.h",
         "FileSystem.h",

diff --git a/stripe-build.yaml b/stripe-build.yaml
@@ -6,4 +6,4 @@ network:
   restrict_network: true
   http_proxy_report_only: true
 bazel:
-  version: "2.0.0"
+  version: "2.2.0"