6281806

cms-sw · Jan 18, 2024 · 6c1298c · 6c1298c
1 parent e18687d
commit 6c1298c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/SCRAM/GMake/Makefile.bigedm.rules b/SCRAM/GMake/Makefile.bigedm.rules
@@ -118,7 +118,7 @@ $($(1)_objdir)/bigobj/$(3)/$(1).$(BIGLIB_OBJEXT): $(subst $($(1)_objdir)/,$($(1)
 	$$(call big_obj,$(2),$(1),$$^,$(SCRAMSTORENAME_OBJS),$3)
 endef
 define TargetBigPlugin
-$(1)_$(3)_BUILD_ENV:=CMSSW_CPU_TYPE=$(patsubst scram_%,%$3) &&
+$(1)_$(3)_BUILD_ENV:=CMSSW_CPU_TYPE=$(patsubst scram_%,%,$3) &&
 $(1)_objs_$3:=$(foreach o,$($(1)_objs),$(eval n:=$(basename $(notdir $o)))\
                   $(if $(strip $(filter $3,$($(n)_LOC_FLAGS_TARGETS))),\
                        $(subst /$(n).$(BIGLIB_OBJEXT),/$3/$(n).$(BIGLIB_OBJEXT),$o),\

diff --git a/SCRAM/GMake/Makefile.rules b/SCRAM/GMake/Makefile.rules
@@ -1297,7 +1297,7 @@ endef
 #safename,path,safepath,scriptstore,scripts,libstore,logprodstore,plugintype
 define Library
 $(1)_plugintype:=$(8)
-ifeq ($(SCRAM_MULTI_TARGET),1)
+ifeq ($(strip $(SCRAM_MULTI_TARGET)$(filter alpaka/cuda alpaka/rocm,$($(1)_PRODUCT_TYPE))),1)
 ifeq ($(strip $(USER_TARGETS_ALL)),1)
 $(1)_LOC_FLAGS_TARGETS:=$(call GetCompilerData,$1,SCRAM_TARGETS)
 else ifeq ($(strip $($(1)_LOC_FLAGS_TARGETS)),1)