Skip to content

Conversation

eli-schwartz
Copy link
Member

This reverts commit c94c492.

This broke propagated deps as well as PCH in MSVC, and has not been fixed in time for the final release of 0.64.0, so it needs to be reverted and then brought back later.

Fixes #10745
Fixes #10975

Also reverts the following commits that were broken and fixed by c94c492 and therefore need to be reverted by it:

  • Revert "tests: Test extern'd globals on MacOS with the Apple Archiver"
    This reverts commit d285be7.
  • Revert "backends/ninja: run ranlib -c $out when using the apple ar"
    This reverts commit bdc6f24.

…ir objects"

This reverts commit c94c492.

This broke propagated deps as well as PCH in MSVC, and has not been
fixed in time for the final release of 0.64.0, so it needs to be
reverted and then brought back later.

Fixes mesonbuild#10745
Fixes mesonbuild#10975
This reverts commit d285be7.

This is part of mesonbuild#10628 and needs to be reverted, as it breaks other
things.

See mesonbuild#10628 (comment)
This reverts commit bdc6f24.

This is part of mesonbuild#10628 and needs to be reverted, as it breaks other
things.

See mesonbuild#10628 (comment)
@codecov
Copy link

codecov bot commented Nov 1, 2022

Codecov Report

Merging #10976 (59cb4a8) into master (81763e6) will decrease coverage by 2.58%.
The diff coverage is n/a.

❗ Current head 59cb4a8 differs from pull request most recent head 21f86fa. Consider uploading reports for the commit 21f86fa to get more accurate results

@@            Coverage Diff             @@
##           master   #10976      +/-   ##
==========================================
- Coverage   68.31%   65.73%   -2.59%     
==========================================
  Files         412      207     -205     
  Lines       87768    44878   -42890     
  Branches    19385     9271   -10114     
==========================================
- Hits        59962    29502   -30460     
+ Misses      23315    13030   -10285     
+ Partials     4491     2346    -2145     
Impacted Files Coverage Δ
scripts/clangtidy.py 0.00% <0.00%> (-93.34%) ⬇️
modules/cuda.py 0.00% <0.00%> (-72.64%) ⬇️
templates/cudatemplates.py 37.50% <0.00%> (-62.50%) ⬇️
compilers/cuda.py 19.63% <0.00%> (-45.40%) ⬇️
dependencies/cuda.py 19.23% <0.00%> (-43.75%) ⬇️
modules/icestorm.py 57.14% <0.00%> (-40.00%) ⬇️
compilers/cython.py 43.18% <0.00%> (-38.64%) ⬇️
dependencies/platform.py 24.24% <0.00%> (-30.31%) ⬇️
compilers/d.py 38.23% <0.00%> (-18.63%) ⬇️
dependencies/coarrays.py 45.00% <0.00%> (-17.50%) ⬇️
... and 259 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@eli-schwartz eli-schwartz merged commit 21f86fa into mesonbuild:master Nov 1, 2022
@eli-schwartz eli-schwartz deleted the revert-broken-pch branch November 1, 2022 06:21
@jpakkane
Copy link
Member

jpakkane commented Nov 1, 2022

Merging this so fast without someone else reviewing it is not really cool. At the very least this MR should have added the regression test from #10962 both to ensure that this fixes the issue and that it won't slip by the next time this fix is attempted. I have rebased that MR to rerun the tests.

@eli-schwartz
Copy link
Member Author

eli-schwartz commented Nov 1, 2022

I figured since it's a straight revert there isn't much to review. :/

And I pinged @anarazel to rebase the PR with the test... It is extremely on my radar and won't be forgotten, it just depends on a revert before it passes CI...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants