fix: linux build#7039
Merged
rhuanjl merged 2 commits intochakra-core:masterfrom Oct 4, 2025
Merged
Conversation
11ce3b3 to
5b13d56
Compare
Merged
Contributor
Author
|
As expected
Strangely, one win-x86 test fails. ChakraCore/test/typedarray/allocation.js Lines 6 to 12 in 36becec |
Collaborator
That win x86 test has been flakey for a long time - sometimes passes, sometimes hits out of memory. |
Contributor
Author
|
Hey, thank you for the quick merge! |
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
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.
palinternal.hdefines a fallback for theminandmaxmacros in case the compiler does not:ChakraCore/pal/src/include/pal/palinternal.h
Lines 689 to 696 in 36becec
finite.cppimportspalinternal.hbefore<math>so we end up with two conflicting definitions ofminandmax:ChakraCore/pal/src/cruntime/finite.cpp
Lines 22 to 24 in 36becec
@rhuanjl This is the first in a stack of PRs that will hopefully fix MacOS ci.
Until then, MacOS builds will fail...