Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion SCRAM/GMake/Makefile.rules
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ $(1)_srcdir := $(2)
$(1)_files := $$(filter-out $($(1)_SKIP_FILES), $(sort $($(1)_files)))
$(1)_prodsrc := $$(addprefix $(patsubst $(SCRAM_SOURCEDIR)/%,%,$2/),$$($(1)_files))
$(1)_files_exts := $$(sort $$(patsubst .%,%,$$(suffix $$(filter-out $$(addprefix %.,$(FILE_EXT_CC_MAP)),$$(notdir $$($(1)_files))))) $$(foreach e,$(FILE_EXT_CC_MAP),$$(if $$(strip $$(filter %.$$e,$$(notdir $$($(1)_files)))),$$e,)))
$(1)_LOC_USE += $$(if $$(strip $$(filter $(FORTRANSRC_FILES_SUFFIXES),$$($(1)_files_exts))),$(F77_TYPE_COMPILER),)
$(1)_LOC_USE += $$(if $$(strip $$(filter $(FORTRANSRC_FILES_SUFFIXES),$$($(1)_files_exts))),$(F77_TYPE_COMPILER),) $(if $(strip $(filter alpaka/%,$($(1)_PRODUCT_TYPE))),$(if $(strip $($($($(3)_parent))_EX_LIB)),$($(3)_parent)))
$(1)_objs := $$(addprefix $$($(1)_objdir)/, $$(addsuffix .$(OBJEXT),$$($(1)_files)))
$(foreach u,$(call Uniq,$(strip $($(1)_LOC_FLAGS_FORCE_LINK) $(foreach x,$($(1)_LOC_USE),$(if $(strip $($(x)_EX_FLAGS_FORCE_LINK)),$x)))),$(foreach l,$($(u)_EX_LIB),$(eval $(1)_$(l)_force_link:=1)))
ifneq ($(strip $(filter alpaka/%,$($(1)_PRODUCT_TYPE))),)
Expand Down
2 changes: 1 addition & 1 deletion SCRAM/Plugins/BuildRules.py
Original file line number Diff line number Diff line change
Expand Up @@ -1393,7 +1393,7 @@ def library_template_generic(self, check_alpaka=True):

def alpaka_extra_flags(self, bend):
self.set('use_private', 'alpaka-%s' % bend)
extra_use = [self.get("parent")]
extra_use = []
for f in ["USE_ALPAKA", "USE_ALPAKA_" + bend.upper()]:
for u in [d for d in self.core.get_flag_value(f).split(" ") if d]:
if u=="1": continue
Expand Down