From 5664a09df59ae32645863107853f0324431bac7f Mon Sep 17 00:00:00 2001
From: Jacob Heider <jacob@pkgx.dev>
Date: Mon, 8 Jul 2024 17:27:00 -0400
Subject: [PATCH] fix(watchman)

---
 projects/facebook.com/watchman/package.yml | 29 +++++++---------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/projects/facebook.com/watchman/package.yml b/projects/facebook.com/watchman/package.yml
index 373c002a3..36e6b82f2 100644
--- a/projects/facebook.com/watchman/package.yml
+++ b/projects/facebook.com/watchman/package.yml
@@ -19,7 +19,8 @@ dependencies:
   pcre.org/v2: ^10
   python.org: ~3.11
   linux:
-    libcxx.llvm.org: 18 # libunwind/libc++
+    libcxx.llvm.org: 18 # libunwind
+    gnu.org/gcc/libstdcxx: 13
 
 build:
   dependencies:
@@ -29,6 +30,8 @@ build:
     google.com/googletest: '*'
     facebook.com/mvfst: '>=2023.12.25.0'
     rust-lang.org: '*'
+    linux:
+      gnu.org/gcc: 13
   script:
     # version/path mismatch
     - run: |
@@ -36,7 +39,7 @@ build:
           sed -i 's/watchman_client = { version = ".*", path/watchman_client = { path/' Cargo.toml
         fi
       working-directory: watchman/cli
-    - cmake -S . -B build $CMAKE_ARGS -DCMAKE_CXX_FLAGS="$CXXFLAGS"
+    - cmake -S . -B build $CMAKE_ARGS -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS"
     - cmake --build build
     - cmake --install build
     - mkdir -p {{prefix}}/var/run/watchman
@@ -53,25 +56,11 @@ build:
       - -DWATCHMAN_VERSION_OVERRIDE={{version}}
       - -DPython3_EXECUTABLE={{deps.python.org.prefix}}/bin/python
     linux:
-      CC: clang
-      CXX: clang++
-      LD: clang
-      CMAKE_ARGS:
-        - -DCMAKE_C_FLAGS=-fPIC
-    linux/x86-64:
-      CXXFLAGS:
-        - -fPIC
-        - -Wl,--allow-shlib-undefined
-      CMAKE_ARGS:
-        - -DCMAKE_EXE_LINKER_FLAGS=-Wl,-pie
-    linux/aarch64:
-      CXXFLAGS:
-        - -fPIC
-        - -Wl,--allow-shlib-undefined
-        - -cxx-isystem {{deps.libcxx.llvm.org.prefix}}/include/c++/v1
-        - -stdlib=libc++
+      CC: gcc
+      CXX: g++
+      LD: gcc
       CMAKE_ARGS:
-        - -DCMAKE_EXE_LINKER_FLAGS=-Wl,-pie,-lc++
+        - -DCMAKE_EXE_LINKER_FLAGS=-Wl,-pie,-lstdc++,-latomic
 
 provides:
   - bin/watchman