Build Abseil on macOS

CI build types: macos-x86_64
yugabyte · Sep 15, 2023 · 46c925f · 46c925f
1 parent 2ac0d79
commit 46c925f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/macos_build.sh b/.github/workflows/macos_build.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-brew install autoconf automake pkg-config shellcheck
+brew install autoconf automake pkg-config shellcheck bazelisk
 dirs=( /opt/yb-build/{thirdparty,brew,tmp} )
 sudo mkdir -p "${dirs[@]}"
 sudo chmod 777 "${dirs[@]}"

diff --git a/python/yugabyte_db_thirdparty/builder.py b/python/yugabyte_db_thirdparty/builder.py
@@ -76,6 +76,7 @@
     YB_THIRDPARTY_DIR,
     add_path_entry,
     shlex_join,
+    which_executable,
 )
 from yugabyte_db_thirdparty.file_system_layout import FileSystemLayout
 from yugabyte_db_thirdparty import file_system_layout
@@ -372,8 +373,9 @@ def populate_dependencies(self) -> None:
                 ['libunistring', 'gettext'] if is_macos() else []
             ) + [
                 'ncurses',
+                'abseil',
             ] + (
-                [] if is_macos() else ['libkeyutils', 'libverto', 'abseil', 'tcmalloc']
+                [] if is_macos() else ['libkeyutils', 'libverto', 'tcmalloc']
             ) + [
                 'libedit',
                 'icu4c',
@@ -793,8 +795,15 @@ def build_with_bazel(
             should_clean: bool = True,
             targets: List[str] = []) -> None:
         log_prefix = self.log_prefix(dep)
+        bazel_path = which_executable('bazel')
+        if not bazel_path:
+            bazel_path = which_executable('bazelisk')
+            if not bazel_path:
+                raise IOError("Could not find bazel or bazelisk executable")
+            log("Using bazelisk wrapper instead of bazel: %s", bazel_path)
+
         if should_clean:
-            self.log_output(log_prefix, ['bazel', 'clean', '--expunge'])
+            self.log_output(log_prefix, [bazel_path, 'clean', '--expunge'])
 
         # Need to remove the space after isystem so replacing the space separators with colons
         # works properly.
@@ -803,7 +812,7 @@ def build_with_bazel(
         bazel_linkopts = os.environ["LDFLAGS"].replace(" ", ":")
 
         # Build without curses for more readable build output.
-        build_command = ["bazel", "build", "--curses=no"]
+        build_command = [bazel_path, "build", "--curses=no"]
         if verbose_output:
             build_command.append("--subcommands")
         build_command += ["--action_env", f"BAZEL_CXXOPTS={bazel_cxxopts}"]