From: Rainer Jung <rainer.jung@kippdata.de>
Date: Thu, 7 Sep 2023 22:27:07 +0000 (+0200)
Subject: Regexp modifier "r" needs perl 5.14; OpenSSL should build with 5.11, so do not use... 
X-Git-Tag: openssl-3.2.0-alpha2~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d30695ba4de494a8554c05afbfc0f984315a6306;p=thirdparty%2Fopenssl.git

Regexp modifier "r" needs perl 5.14; OpenSSL should build with 5.11, so do not use the "r" shortcut.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22019)
---

diff --git a/Configurations/50-win-hybridcrt.conf b/Configurations/50-win-hybridcrt.conf
index 2ddd25a42a4..242583c7281 100644
--- a/Configurations/50-win-hybridcrt.conf
+++ b/Configurations/50-win-hybridcrt.conf
@@ -11,7 +11,8 @@
 sub remove_from_flags {
     my ($toRemove, $flags) = @_;
     
-    return $flags =~ s/$toRemove//r;
+    $flags =~ s/$toRemove//;
+    return $flags;
 }
 
 my %targets = (