bootstrap: Always use environment variables for build #2546
Conversation
This file contains 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
This fixes a case where libtbx failed to configure with conda compilers on MacOS 14 (Sonoma). Since the build system doesn't attempt to work out what fundamental flags are needed to do basic compiler checks itself, defer this decision to the configured environment directly. In most cases using DIALS bootstrap, this will end up being just the flags from the configured conda environment. This also has the side-effect of better aligning the built DIALS objects between CMake and the libtbx SCons variant builds. Fixes #2532.
|
This could potentially cause problems if users have so thoroughly misconfigured systems that even after loading the conda environment builds are broken. I think we'll only be able to validate this by releasing into the wild. |
Codecov Report
@@ Coverage Diff @@
## main #2546 +/- ##
==========================================
- Coverage 78.83% 78.79% -0.04%
==========================================
Files 609 609
Lines 74659 74659
Branches 10623 10623
==========================================
- Hits 58856 58831 -25
- Misses 13625 13651 +26
+ Partials 2178 2177 -1 |
graeme-winter
pushed a commit
to graeme-winter/dials
that referenced
this pull request
Nov 30, 2023
This fixes a case where libtbx failed to configure with conda compilers on MacOS 14 (Sonoma). Since the build system doesn't attempt to work out what fundamental flags are needed to do basic compiler checks itself, defer this decision to the configured environment directly. In most cases using DIALS bootstrap, this will end up being just the flags from the configured conda environment. This also has the side-effect of better aligning the built DIALS objects between CMake and the libtbx SCons variant builds. Fixes dials#2532.
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.
This fixes a case where libtbx failed to configure with conda compilers on MacOS 14 (Sonoma). Since the build system doesn't attempt to work out what fundamental flags are needed to do basic compiler checks itself, defer this decision to the configured environment directly.
In most cases using DIALS bootstrap, this will end up being just the flags from the configured conda environment.
This also has the side-effect of better aligning the built DIALS objects between CMake and the libtbx SCons variant builds.
Fixes #2532.