Fix compilation of native code systhreads#13520
Merged
xavierleroy merged 1 commit intoocaml:trunkfrom Oct 23, 2024
Merged
Conversation
ghost
reviewed
Oct 7, 2024
otherlibs/systhreads/Makefile
Outdated
| # st_stubs.n.$(O) from the same source file st_stubs.c (it is compiled | ||
| # twice, each time with different options). | ||
|
|
||
| st_stubs.n.$(O): OC_CPPFLAGS += $(OC_NATIVE_CPPFLAGS) |
There was a problem hiding this comment.
Isn't this line redundant with the generic rule added to line 146? (i.e. do things build correctly if you remove this line)?
Member
Author
There was a problem hiding this comment.
Oh ah - turns out that this got left in in #9332!
Contributor
|
Apparently it's me who broke this, very sorry about that.
The `+=` in the definitions look suspiscious to me as 'd more expect `=`
than `+=` since the recent build system refactorings.
|
Member
Author
|
Ah, I confess I had my reverting brain switched on at the time (see https://github.com/ocaml/ocaml/pull/12108/files#diff-634a7188134ebafc936dd83ec93b4d275f5f997118b79ae975ee37050133581d)... I'll double-check why that was done before that way. The |
st_stubs.c uses NATIVE_CODE, which had stopped being defined.
87d433b to
4a8beef
Compare
Member
Author
xavierleroy
pushed a commit
that referenced
this pull request
Oct 23, 2024
st_stubs.c uses NATIVE_CODE, which had stopped being defined. (cherry picked from commit 8f8ee0a)
Contributor
|
Cherry-picked to 5.3. @Octachron I'l let you decide whether to backport this one to 5.2. |
Member
Author
|
@Octachron - OK to cherry-pick this to 5.2? |
Member
|
Ok, but beware that I will tag 5.2.1~rc1 this afternoon. |
dra27
added a commit
to dra27/ocaml
that referenced
this pull request
Nov 7, 2024
st_stubs.c uses NATIVE_CODE, which had stopped being defined. (cherry picked from commit 8f8ee0a)
dra27
added a commit
to dra27/ocaml
that referenced
this pull request
Nov 7, 2024
st_stubs.c uses NATIVE_CODE, which had stopped being defined. (cherry picked from commit 8f8ee0a)
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
4 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.
st_stubs.c uses
NATIVE_CODE, which had stopped being defined in #12108.On Unix, this appears to be mostly benign, but it causes a noticeable error on Windows in ocamlnat, where
caml_debugger_in_useis not masked away by the linker.The full fix for Windows is a little bit bigger (which @shindere is working on), but this fix ought to go in 5.2/5.3 as well.