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

Fix make help #2854

Merged
merged 2 commits into from
Jun 23, 2022
Merged

Fix make help #2854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c98460
Fix make help
WeiqunZhang Jun 23, 2022
2881f96
Use double quotes
WeiqunZhang Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Tools/GNUMake/Make.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,9 +512,14 @@ endif
# e.g. libraries, simply do "make print-libraries". This will
# print out the value.
print-%:
@echo $* is '$($*)'
@echo $* is "$($*)"
@echo ' origin = $(origin $*)'
@echo ' value = $(value $*)'
@echo ' value = $(subst ','"'"',$(value $*))'
# We need to use subst on the result of $(value) because it contains single
# quotes. Shell command echo does not like things like 'x'$(filiter-out)'y',
# because what it sees is 'x', $(filter-out), and 'y'. With the substition, it
# will see 'x', "'", '$(filter-out)', "'", and 'y', with $(filter-out) inside a
# pair of single quotes.

.PHONY: help
help:
Expand Down
8 changes: 4 additions & 4 deletions Tools/GNUMake/sites/Make.nersc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ ifeq ($(which_computer),$(filter $(which_computer),perlmutter))

ifeq ($(USE_CUDA),TRUE)
ifdef NPE_VERSION
CFLAGS += -Xcompiler="$(filter-out -Wl%, $(wordlist 2,1024,$(shell mpicc -show 2> /dev/null)))"
CXXFLAGS += -Xcompiler="$(filter-out -Wl%, $(wordlist 2,1024,$(shell mpicxx -show 2> /dev/null)))"
CFLAGS += -Xcompiler='$(filter-out -Wl%, $(wordlist 2,1024,$(shell mpicc -show 2> /dev/null)))'
CXXFLAGS += -Xcompiler='$(filter-out -Wl%, $(wordlist 2,1024,$(shell mpicxx -show 2> /dev/null)))'
else
CFLAGS += -Xcompiler="$(wordlist 2,1024,$(shell cc -craype-verbose 2> /dev/null))"
CXXFLAGS += -Xcompiler="$(wordlist 2,1024,$(shell CC -craype-verbose 2> /dev/null))"
CFLAGS += -Xcompiler='$(wordlist 2,1024,$(shell cc -craype-verbose 2> /dev/null))'
CXXFLAGS += -Xcompiler='$(wordlist 2,1024,$(shell CC -craype-verbose 2> /dev/null))'
endif
else ifeq ($(USE_MPI),FALSE)
CFLAGS += $(wordlist 2,1024,$(shell cc -craype-verbose 2> /dev/null))
Expand Down