From 147cc97ff70e17e777a8e3eb96fd202200e0c4b9 Mon Sep 17 00:00:00 2001
From: Filipe Felisbino <filipe.felisbino@udemy.com>
Date: Tue, 10 Oct 2023 06:54:37 -0700
Subject: [PATCH] restore changes to common.sh and fbthrift

---
 mcrouter/scripts/common.sh           | 2 +-
 mcrouter/scripts/recipes/fbthrift.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mcrouter/scripts/common.sh b/mcrouter/scripts/common.sh
index c2ad444a1..214325f71 100644
--- a/mcrouter/scripts/common.sh
+++ b/mcrouter/scripts/common.sh
@@ -14,7 +14,7 @@ PKG_DIR="$1"
 INSTALL_DIR="$2"
 INSTALL_AUX_DIR="$3"
 shift $#
-MAKE_ARGS="$@ -j4"
+MAKE_ARGS="$@ -j$(nproc)"
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
 mkdir -p "$PKG_DIR" "$INSTALL_DIR"
diff --git a/mcrouter/scripts/recipes/fbthrift.sh b/mcrouter/scripts/recipes/fbthrift.sh
index ee31c38eb..a4e84bef8 100755
--- a/mcrouter/scripts/recipes/fbthrift.sh
+++ b/mcrouter/scripts/recipes/fbthrift.sh
@@ -7,7 +7,7 @@
 source common.sh
 
 if [[ ! -d "$PKG_DIR/fbthrift" ]]; then
-  git clone -b main https://github.com/facebook/fbthrift
+  git clone https://github.com/facebook/fbthrift
   cd "$PKG_DIR/fbthrift" || die "cd fail"
   if [[ -f "$REPO_BASE_DIR/mcrouter/FBTHRIFT_COMMIT" ]]; then
     FBTHRIFT_COMMIT="$(head -n 1 "$REPO_BASE_DIR/mcrouter/FBTHRIFT_COMMIT")"