Makefile.config: restore the {OCAMLC,OCAMLOPT}_{CFLAGS,CPPFLAGS} variables#13519
Merged
dra27 merged 1 commit intoocaml:trunkfrom Nov 6, 2024
Merged
Conversation
shindere
force-pushed
the
cflags-variables-backward-compatibility
branch
from
53c80bb to
003aae5
Compare
ghost
approved these changes
Oct 3, 2024
ghost
left a comment
ghost
left a comment
There was a problem hiding this comment.
Looking good. Maybe add a future deprecation comment somewhere?
shindere
force-pushed
the
cflags-variables-backward-compatibility
branch
2 times, most recently
from
2f298b6 to
609faea
Compare
Contributor
Author
|
Miod Vallat (2024/10/03 09:04 -0700):
@dustanddreams approved this pull request.
thanks!
Looking good. Maybe add a future deprecation comment somewhere?
Sure, many thanks for the suggestion.
On top of that I have pushed a commit implementing an alternative
definition of the deprecated variables, defining them in terms of other
build varialbes rather than in terms of tokens to be substituted by
`config.status`.
I am unsure on whihc versions is better. I tend to prefer the first one
because itt's more regular. In the second, alternative one, it is not
possible to define `OCAMLOPT_CPPFLAGS` in temrs of build variables
because we didn't have it before anyway.
|
dra27
reviewed
Oct 21, 2024
Comment on lines
+226
to
+229
| OCAMLC_CFLAGS=$(BYTECODE_CFLAGS) | ||
| OCAMLOPT_CFLAGS=$(OCAMLOPT_CFLAGS) | ||
| OCAMLC_CPPFLAGS=$(BYTECODE_CPPFLAGS) | ||
| OCAMLOPT_CPPFLAGS=@native_cppflags@ |
Member
There was a problem hiding this comment.
It seems OK to have OCAMLC_CFLAGS and OCAMLC_CPPFLAGS being renamed, and OCAMLOPT_CFLAGS and OCAMLOPT_CPPFLAGS removed. There's a small typo with it:
Suggested change
| OCAMLC_CFLAGS=$(BYTECODE_CFLAGS) | |
| OCAMLOPT_CFLAGS=$(OCAMLOPT_CFLAGS) | |
| OCAMLC_CPPFLAGS=$(BYTECODE_CPPFLAGS) | |
| OCAMLOPT_CPPFLAGS=@native_cppflags@ | |
| OCAMLC_CFLAGS=$(BYTECODE_CFLAGS) | |
| OCAMLOPT_CFLAGS=@native_cflags@ | |
| OCAMLC_CPPFLAGS=$(BYTECODE_CPPFLAGS) | |
| OCAMLOPT_CPPFLAGS=@native_cppflags@ |
(I equally don't mind if you just go with the first commit)
shindere
changed the title
…ables They had been renamed in 31cdf41 (part of ocaml#12589) but we should keep the old names for backward compatibility.
shindere
force-pushed
the
cflags-variables-backward-compatibility
branch
from
609faea to
59f4d28
Compare
Contributor
Author
|
Many thanks for the review, @dra27, and sorry it took me so long to come
back to this one although it's so simple.
(I equally don't mind if you just go with the first commit)
I went ahead with that, as it was the approach that had (and still has)
my preference.
|
dra27
added a commit
that referenced
this pull request
Nov 6, 2024
…patibility
Makefile.config: restore the {OCAMLC,OCAMLOPT}_{CFLAGS,CPPFLAGS} variables
(cherry picked from commit f2bac84)
Contributor
Author
|
David Allsopp (2024/11/06 07:51 -0800):
@dra27 approved this pull request.
Let’s do it!
Cool, thanks!
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
They had been renamed in 31cdf41
(part of #12589) but we should keep the old names for backward compatibility.
This is thus a proposed fix for the issue #13503 and should probably go
through @dra27.