Merge branch 'main' into john-clang

Expensify · Jul 16, 2024 · 707e773 · 707e773
2 parents a5de2a7 + fa080ac
commit 707e773
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/bedrock.yml b/.github/workflows/bedrock.yml
@@ -19,6 +19,9 @@ jobs:
     timeout-minutes: 30
     steps:
 
+    - name: Install the Mold Linker
+      uses: rui314/setup-mold@v1
+
     - name: Checkout Bedrock
       uses: actions/checkout@v4.1.0
 

diff --git a/libstuff/libstuff.cpp b/libstuff/libstuff.cpp
@@ -1769,7 +1769,7 @@ int S_socket(const string& host, bool isTCP, bool isPort, bool isBlocking) {
             // There was a problem.
             if (result || !resolved) {
                 freeaddrinfo(resolved);
-                STHROW("can't resolve host error no#" + result);
+                STHROW("can't resolve host error no#" + SToStr(result));
             }
             // Grab the resolved address.
             sockaddr_in* addr = (sockaddr_in*)resolved->ai_addr;