Fix native-compiler detection in ocamltest#10074
Merged
xavierleroy merged 1 commit intoocaml:trunkfrom Dec 7, 2020
Merged
Conversation
this is a follow-up to commit 42efb99 Before that commit, it was possible to determine whether the native-compiler was disabled by comparing the ARCH build variable with the "none" string. This trick was used by ocamltest to figure out whether the native compilers were available or not, because at the time when ocamltest had to be made aware of that, this was the only way to do (there was no build variable to keep track explictly of whether the native compilers were enabled or not at that time, the explicit build variable was introduced later). So, the commit mentionned above actually broke ocamltest, causing it to try (and fail) to run the native compilers when they were disabled at configure time. The present commit fixes this by making ocamltest rely on the appropriate build variable since it has become available meanwhile.
gasche
approved these changes
Dec 7, 2020
Member
gasche
left a comment
There was a problem hiding this comment.
With your explanation, the patch is easy to read and clearly correct. Approved.
Contributor
|
This elucidates the mystery of the CI failing on the "pure bytecode" configuration. Thanks a lot! |
Contributor
Author
|
Thanks a lot, @gasche!
|
Contributor
|
I merged in trunk. If #10044 is cherry-picked to 4.12, this PR must also be cherry-picked. |
Member
|
It is (3248b86). |
dra27
pushed a commit
that referenced
this pull request
Dec 7, 2020
this is a follow-up to commit 42efb99 Before that commit, it was possible to determine whether the native-compiler was disabled by comparing the ARCH build variable with the "none" string. This trick was used by ocamltest to figure out whether the native compilers were available or not, because at the time when ocamltest had to be made aware of that, this was the only way to do (there was no build variable to keep track explictly of whether the native compilers were enabled or not at that time, the explicit build variable was introduced later). So, the commit mentionned above actually broke ocamltest, causing it to try (and fail) to run the native compilers when they were disabled at configure time. The present commit fixes this by making ocamltest rely on the appropriate build variable since it has become available meanwhile. (cherry picked from commit 128d12c)
Member
Contributor
Author
|
No problem, thanks a lot @dra27! Only those who don't do anything don't
do anything wrong. ;-)
|
Member
:-D |
dbuenzli
pushed a commit
to dbuenzli/ocaml
that referenced
this pull request
Mar 25, 2021
this is a follow-up to commit 42efb99 Before that commit, it was possible to determine whether the native-compiler was disabled by comparing the ARCH build variable with the "none" string. This trick was used by ocamltest to figure out whether the native compilers were available or not, because at the time when ocamltest had to be made aware of that, this was the only way to do (there was no build variable to keep track explictly of whether the native compilers were enabled or not at that time, the explicit build variable was introduced later). So, the commit mentionned above actually broke ocamltest, causing it to try (and fail) to run the native compilers when they were disabled at configure time. The present commit fixes this by making ocamltest rely on the appropriate build variable since it has become available meanwhile.
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
5 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.
this PR is a follow-up to commit 42efb99
Before that commit, it was possible to determine whether the
native-compiler was disabled by comparing the ARCH build variable with
the "none" string. This trick was used by ocamltest to figure out
whether the native compilers were available or not, because at the time
when ocamltest had to be made aware of that, this was the only way
to do (there was no build variable to keep track explictly of whether
the native compilers were enabled or not at that time, the explicit
build variable was introduced later).
So, the commit mentionned above actually broke ocamltest, causing it to
try (and fail) to run the native compilers when they were disabled
at configure time.
The present PR fixes this by making ocamltest rely on the appropriate
build variable since it has become available meanwhile.
@xavierleroy: this should help our other-configs CI jobs.