From a26eecd480714020305dc2e286599e5115ea96d6 Mon Sep 17 00:00:00 2001
From: phiresky <phireskyde+git@gmail.com>
Date: Wed, 12 Jun 2019 22:07:46 +0200
Subject: [PATCH] remove pcre stuff

---
 ci/before_deploy.sh | 8 +-------
 ci/build_deb.sh     | 4 +---
 ci/script.sh        | 8 ++------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
index 561cbb5..92a295b 100644
--- a/ci/before_deploy.sh
+++ b/ci/before_deploy.sh
@@ -9,13 +9,7 @@ set -ex
 # Generate artifacts for release
 mk_artifacts() {
     CARGO="$(builder)"
-    if is_arm; then
-        "$CARGO" build --target "$TARGET" --release
-    else
-        # Technically, MUSL builds will force PCRE2 to get statically compiled,
-        # but we also want PCRE2 statically build for macOS binaries.
-        PCRE2_SYS_STATIC=1 "$CARGO" build --target "$TARGET" --release --features 'pcre2'
-    fi
+	"$CARGO" build --target "$TARGET" --release
 }
 
 mk_tarball() {
diff --git a/ci/build_deb.sh b/ci/build_deb.sh
index 4812b47..1d7548f 100755
--- a/ci/build_deb.sh
+++ b/ci/build_deb.sh
@@ -38,6 +38,4 @@ cp "$compfish" "$DEPLOY_DIR/"
 compzsh="complete/_rg"
 cp "$compzsh" "$DEPLOY_DIR/"
 
-# Since we're distributing the dpkg, we don't know whether the user will have
-# PCRE2 installed, so just do a static build.
-PCRE2_SYS_STATIC=1 cargo deb
+cargo deb
diff --git a/ci/script.sh b/ci/script.sh
index 80bfabf..7ad7c34 100755
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -10,11 +10,7 @@ main() {
     CARGO="$(builder)"
 
     # Test a normal debug build.
-    if is_arm; then
-        "$CARGO" build --target "$TARGET" --verbose
-    else
-        "$CARGO" build --target "$TARGET" --verbose --all --features 'pcre2'
-    fi
+    "$CARGO" build --target "$TARGET" --verbose
 
     # Show the output of the most recent build.rs stderr.
     set +x
@@ -46,7 +42,7 @@ main() {
     "$(dirname "${0}")/test_complete.sh"
 
     # Run tests for ripgrep and all sub-crates.
-    "$CARGO" test --target "$TARGET" --verbose --all --features 'pcre2'
+    "$CARGO" test --target "$TARGET" --verbose --all
 }
 
 main