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.

Sign up for GitHub

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

Jump to bottom

Remove error when building LLVM without PrgEnv-gnu loaded on XC #17904

Merged
merged 1 commit into from Jun 17, 2021
Merged

Remove error when building LLVM without PrgEnv-gnu loaded on XC #17904

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 5 additions & 19 deletions third-party/llvm/Makefile
View file
Open in desktop
Expand Up @@ -195,25 +195,11 @@ llvm: $(LLVM_CONFIGURED_HEADER_FILE) $(LLVM_HEADER_FILE) $(LLVM_SUPPORT_FILE) $(

llvm-minimal: $(LLVM_CONFIGURED_HEADER_FILE) $(LLVM_HEADER_FILE) $(LLVM_SUPPORT_FILE) $(LLVM_CONFIG_FILE)

# Just adding this error since this is the only configuration we test.
check-prgenv-gnu: FORCE
@case "$(CHPL_MAKE_TARGET_COMPILER_PRGENV)" in \
none) \
;; \
cray-prgenv-gnu) \
;; \
*) \
echo "Error: make with CHPL_LLVM!=none requires PrgEnv-gnu" ; \
echo " e.g. module swap PrgEnv-cray PrgEnv-gnu" ; \
echo " or to just build the runtime, use 'make runtime'" ;\
exit 1 ; \
esac

llvm-clang: check-prgenv-gnu llvm

bundled: check-prgenv-gnu llvm

system: check-prgenv-gnu $(LLVM_CLANG_CONFIG_FILE)
llvm-clang: llvm

bundled: llvm

system: $(LLVM_CLANG_CONFIG_FILE)

system-minimal:

Expand Down