Miscellaneous EVG compilation script improvements #1710
Merged
Conversation
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
kevinAlbs
approved these changes
Aug 27, 2024
.evergreen/scripts/compile-unix.sh
Outdated
| @@ -82,8 +82,14 @@ configure_flags_append_if_not_null SRV "-DENABLE_SRV=${SRV}" | |||
| configure_flags_append_if_not_null TRACING "-DENABLE_TRACING=${TRACING}" | |||
| configure_flags_append_if_not_null ZLIB "-DENABLE_ZLIB=${ZLIB}" | |||
|
|
|||
| if [[ "${DEBUG:-}" == "ON" && "${RELEASE:-}" == "ON" ]]; then | |||
There was a problem hiding this comment.
We should consider refactoring the config to use only one or the other.
Consider removing RELEASE since it appears unused. Though it could be done in a future PR.
There was a problem hiding this comment.
RELEASE is used by the release-compile EVG task. It may be preferable to remove DEBUG instead and let all EVG tasks use Debug build type by default.
.evergreen/scripts/compile-unix.sh
Outdated
| "${cmake_binary}" "${configure_flags[@]}" ${extra_configure_flags[@]+"${extra_configure_flags[@]}"} . | ||
| "${cmake_binary}" --build . | ||
| "${cmake_binary}" --install . | ||
| "${cmake_binary}" -S . -B build "${configure_flags[@]}" ${extra_configure_flags[@]+"${extra_configure_flags[@]}"} . |
There was a problem hiding this comment.
Suggested change
| "${cmake_binary}" -S . -B build "${configure_flags[@]}" ${extra_configure_flags[@]+"${extra_configure_flags[@]}"} . | |
| "${cmake_binary}" -S . -B cmake-build "${configure_flags[@]}" ${extra_configure_flags[@]+"${extra_configure_flags[@]}"} . |
Consider using cmake-build to avoid possibly interfering with existing files in the build directory.
|
Latest changes verified by this patch. |
kevinAlbs
approved these changes
Aug 28, 2024
| @@ -736,7 +736,7 @@ def pre_commands(self) -> Iterable[Value]: | |||
| commands=[ | |||
| shell_mongoc( | |||
| """ | |||
| env SANITIZE=address DEBUG=ON SASL=AUTO SSL=OPENSSL EXTRA_CONFIGURE_FLAGS='-DENABLE_EXTRA_ALIGNMENT=OFF' .evergreen/scripts/compile.sh | |||
There was a problem hiding this comment.
Remove reference to no-longer-needed DEBUG environment variable on line 74:
if config == "debug":
self.compile_sh_opt["DEBUG"] = "ON"
else:
assert config == "release"
self.compile_sh_opt["RELEASE"] = "ON"
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.
Followup to #1524. Verified by this patch.
Addresses the following error on some Windows distros when used with the old
CCache.cmakemodule (discovered while testing the C++ Driver; this does not break builds but does impact ccache efficiency):Applies a proper transformation to Windows path form on Windows distros to avoid Windows-side cmake or ccache confusion of file paths.
Additional improvements include:
buildsubdirectory as the binary directory for CMake.