remove pcre stuff

This commit is contained in:
phiresky 2019-06-12 22:07:46 +02:00
parent 3af80a3709
commit a26eecd480
3 changed files with 4 additions and 16 deletions

View File

@ -9,13 +9,7 @@ set -ex
# Generate artifacts for release # Generate artifacts for release
mk_artifacts() { mk_artifacts() {
CARGO="$(builder)" CARGO="$(builder)"
if is_arm; then "$CARGO" build --target "$TARGET" --release
"$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
} }
mk_tarball() { mk_tarball() {

View File

@ -38,6 +38,4 @@ cp "$compfish" "$DEPLOY_DIR/"
compzsh="complete/_rg" compzsh="complete/_rg"
cp "$compzsh" "$DEPLOY_DIR/" cp "$compzsh" "$DEPLOY_DIR/"
# Since we're distributing the dpkg, we don't know whether the user will have cargo deb
# PCRE2 installed, so just do a static build.
PCRE2_SYS_STATIC=1 cargo deb

View File

@ -10,11 +10,7 @@ main() {
CARGO="$(builder)" CARGO="$(builder)"
# Test a normal debug build. # Test a normal debug build.
if is_arm; then "$CARGO" build --target "$TARGET" --verbose
"$CARGO" build --target "$TARGET" --verbose
else
"$CARGO" build --target "$TARGET" --verbose --all --features 'pcre2'
fi
# Show the output of the most recent build.rs stderr. # Show the output of the most recent build.rs stderr.
set +x set +x
@ -46,7 +42,7 @@ main() {
"$(dirname "${0}")/test_complete.sh" "$(dirname "${0}")/test_complete.sh"
# Run tests for ripgrep and all sub-crates. # Run tests for ripgrep and all sub-crates.
"$CARGO" test --target "$TARGET" --verbose --all --features 'pcre2' "$CARGO" test --target "$TARGET" --verbose --all
} }
main main