Do not remove -O0 in the middle of a flag #15828
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Discard known '-O' flags, including just '-O', but do not remove only '-O' in '-Ounknown'
|
I'll just try to reproduce here that nix shell bug with ${SED} vs $SED here what was the problem back then... Edit: I see, got it. Relative paths were the problem back then. But that was happening only where the IFS got changed and those dots need to be used to get the version. For example, |
petk
reviewed
Sep 11, 2024
Comment on lines
+2746
to
+2750
| changequote({,}) | ||
| sed_script='s/\([\t ]\|^\)-O\([0-9gsz]\|fast\|\)\([\t ]\|$\)/\1/g' | ||
| changequote([,]) | ||
| CFLAGS=`echo "$CFLAGS" | sed -e "$sed_script"` | ||
| CXXFLAGS=`echo "$CFLAGS" | sed -e "$sed_script"` |
There was a problem hiding this comment.
Suggested change
| changequote({,}) | |
| sed_script='s/\([\t ]\|^\)-O\([0-9gsz]\|fast\|\)\([\t ]\|$\)/\1/g' | |
| changequote([,]) | |
| CFLAGS=`echo "$CFLAGS" | sed -e "$sed_script"` | |
| CXXFLAGS=`echo "$CFLAGS" | sed -e "$sed_script"` | |
| sed_script='s/\([[\t ]]\|^\)-O\([[0-9gsz]]\|fast\|\)\([[\t ]]\|$\)/\1/g' | |
| CFLAGS=$(echo "$CFLAGS" | $SED -e "$sed_script") | |
| CXXFLAGS=$(echo "$CFLAGS" | $SED -e "$sed_script") |
I've removed previous suggestion and added all in one:
- backticks command substitution replaced with $(...)
- $SED used instead of sed direct command so SED variable can be set at the configure step
SED=../path/to/sed ./configure - changequote builtin M4 macro is something that ideally should be avoided for the cost of duplicating the [ and ] characters in the sed_script variable a bit.
There was a problem hiding this comment.
Ah, sorry and another one. Probably the most important one as CXXFLAGS should be its own variable instead.
diff --git a/build/php.m4 b/build/php.m4
index dee47f6e1a..e13fc3367e 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -2745,5 +2745,5 @@ dnl
AC_DEFUN([PHP_REMOVE_OPTIMIZATION_FLAGS], [
sed_script='s/\([[\t ]]\|^\)-O\([[0-9gsz]]\|fast\|\)\([[\t ]]\|$\)/\1/g'
CFLAGS=$(echo "$CFLAGS" | $SED -e "$sed_script")
- CXXFLAGS=$(echo "$CFLAGS" | $SED -e "$sed_script")
+ CXXFLAGS=$(echo "$CXXFLAGS" | $SED -e "$sed_script")
])
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This backports #9647 from master and improves it to avoid accidentally breaking flags ending with something looking like an optimization flag. (#9647 fixed that for flags starting with an optimization flag.)
This should fix #15826