xnu-6153.141.1.tar.gz

[apple/xnu.git] / tools / tests / affinity / Makefile

diff --git a/tools/tests/affinity/Makefile b/tools/tests/affinity/Makefile
index 98f4e9e451cf69c8bac227361d9f4dc1cdf5a3dc..5f45973ab8924f237e43f99e4b27d03cd0957912 100644 (file)
--- a/tools/tests/affinity/Makefile
+++ b/tools/tests/affinity/Makefile
@@ -14,12 +14,18 @@ ifdef RC_ARCHS
   endif
 endif
 
-ARCH_32 := $(filter-out %64, $(ARCHS))
+# These are convenience functions for filtering based on substrings, as the
+# normal filter functions only accept one wildcard.
+FILTER_OUT_SUBSTRING=$(strip $(foreach string,$(2),$(if $(findstring $(1),$(string)),,$(string))))
+FILTER_SUBSTRING=$(strip $(foreach string,$(2),$(if $(findstring $(1),$(string)),$(string),)))
+
+ARCH_32:=$(call FILTER_OUT_SUBSTRING,64,$(ARCHS))
+ARCH_64:=$(call FILTER_SUBSTRING,64,$(ARCHS))
+
 ARCH_32_FLAGS := $(patsubst %, -arch %, $(ARCH_32))
-ARCH_64 := $(filter %64, $(ARCHS))
 ARCH_64_FLAGS := $(patsubst %, -arch %, $(ARCH_64))
 
-CFLAGS         :=-g -isysroot $(SDKROOT) -I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
+CFLAGS :=-g -isysroot $(SDKROOT) -I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
 
 DSTROOT?=$(shell /bin/pwd)
 SRCROOT?=$(shell /bin/pwd)
@@ -34,7 +40,7 @@ TARGETS := $(if $(ARCH_64), $(ARCH_64_TARGETS)) $(if $(ARCH_32), $(ARCH_32_TARGE
 all:   $(TARGETS)
 
 $(ARCH_32_TARGETS): $(DSTROOT)/%: $(SRCROOT)/%.c
-       $(CC) $(CFLAGS) $(ARCH_32_FLAGS) $< -o $(SYMROOT)/$(notdir $@) # 32-bit fat 
+       $(CC) $(CFLAGS) $(ARCH_32_FLAGS) $< -o $(SYMROOT)/$(notdir $@) # 32-bit fat
        if [ ! -e $@ ]; then ditto $(SYMROOT)/$(notdir $@) $@; fi
 
 .SECONDEXPANSION:
@@ -43,5 +49,5 @@ $(ARCH_64_TARGETS): $(DSTROOT)/%: $(SRCROOT)/$$(subst 64,,%).c
        if [ ! -e $@ ]; then ditto $(SYMROOT)/$(notdir $@) $@; fi
 
 clean:
-       rm -f $(TARGETS) 
+       rm -f $(TARGETS)
        rm -rf $(SYMROOT)/*.dSYM