Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build_configs after CHPL_TARGET_COMPILER=llvm change #17887

Merged
merged 1 commit into from Jun 8, 2021

Conversation

mppf
Copy link
Member

@mppf mppf commented Jun 8, 2021

This PR makes adjustments to build_configs to work with the changes
from PR #17800. In particular, that PR changed make for LLVM
configurations to no longer build the runtime twice (once for LLVM and
once for the current C compiler). But the build_configs module build
was relying on this behavior.

  • Set CHPL_TARGET_COMPILER always in the build_configs setenv scripts
  • Build LLVM as the CHPL_TARGET_COMPILER separately
  • do so for EX, x86, and arm builds

Note that setting CHPL_TARGET_COMPILER on a PrgEnv system used to
result in an error but no longer does. I do not know when that changed
but it was at least not an error at the time of the last release (or at
least not an error to run printchplenv). Now it is necessary to set it in
order to request the C backend on such systems when the LLVM backend is
available.

  • checked that the following command functions as expected
util/buildRelease/test_rpm_module.bash  https://github.com/mppf/chapel fix-build-configs-17800

Reviewed by @gbtitus and @Maxrimus - thanks!

---
Signed-off-by: Michael Ferguson <mppf@users.noreply.github.com>
@mppf mppf requested review from gbtitus and Maxrimus June 8, 2021 18:48
@mppf mppf changed the title Fix build_configs after PR #17800 Fix build_configs after CHPL_TARGET_COMPILER=llvm change Jun 8, 2021
Copy link
Member

@gbtitus gbtitus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not doing a module build to check, but visually and based on my understanding of how the role of CHPL_TARGET_COMPILER has changed for PrgEnv-based systems, this looks good to me.

@mppf mppf merged commit 897683c into chapel-lang:master Jun 8, 2021
@mppf mppf deleted the fix-build-configs-17800 branch June 8, 2021 20:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants