X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/fe8ab488e9161c46dd9885d58fc52996dc0249ff..f427ee49d309d8fc33ebf3042c3a775f2f530ded:/tools/tests/affinity/Makefile?ds=sidebyside

diff --git a/tools/tests/affinity/Makefile b/tools/tests/affinity/Makefile
index 41e3848be..7096bdc5b 100644
--- a/tools/tests/affinity/Makefile
+++ b/tools/tests/affinity/Makefile
@@ -1,30 +1,11 @@
-SDKROOT ?= /
-ifeq "$(RC_TARGET_CONFIG)" "iPhone"
-Embedded?=YES
-else
-Embedded?=$(shell echo $(SDKROOT) | grep -iq iphoneos && echo YES || echo NO)
-endif
+include ../Makefile.common
 
 CC:=$(shell xcrun -sdk "$(SDKROOT)" -find cc)
 
 SYMROOT?=$(shell /bin/pwd)
 
-ifdef RC_ARCHS
-    ARCHS:=$(RC_ARCHS)
-  else
-    ifeq "$(Embedded)" "YES"
-      ARCHS:=armv7 armv7s arm64
-    else
-      ARCHS:=x86_64 i386
-  endif
-endif
-
-ARCH_32 := $(filter-out %64, $(ARCHS))
-ARCH_32_FLAGS := $(patsubst %, -arch %, $(ARCH_32))
-ARCH_64 := $(filter %64, $(ARCHS))
-ARCH_64_FLAGS := $(patsubst %, -arch %, $(ARCH_64))
-
-CFLAGS 	:=-g -I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
+CFLAGS	:=-g -isysroot $(SDKROOT) -I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders
+CFLAGS += -Wl,-sectcreate,__INFO_FILTER,__disable,/dev/null
 
 DSTROOT?=$(shell /bin/pwd)
 SRCROOT?=$(shell /bin/pwd)
@@ -33,20 +14,20 @@ SOURCES := sets.c pool.c tags.c
 ARCH_32_TARGETS := $(addprefix $(DSTROOT)/, sets pool tags)
 ARCH_64_TARGETS := $(addprefix $(DSTROOT)/, sets64 pool64 tags64)
 
-TARGETS := $(if $(ARCH_64), $(ARCH_64_TARGETS)) $(if $(ARCH_32), $(ARCH_32_TARGETS))
+TARGETS := $(if $(ARCH_CONFIGS_64), $(ARCH_64_TARGETS)) $(if $(ARCH_CONFIGS_32), $(ARCH_32_TARGETS))
 
 
 all:	$(TARGETS)
 
 $(ARCH_32_TARGETS): $(DSTROOT)/%: $(SRCROOT)/%.c
-	$(CC) $(CFLAGS) $(ARCH_32_FLAGS) $< -o $(SYMROOT)/$(notdir $@) # 32-bit fat 
+	$(CC) $(CFLAGS) $(ARCH_FLAGS_32) $< -o $(SYMROOT)/$(notdir $@) # 32-bit fat
 	if [ ! -e $@ ]; then ditto $(SYMROOT)/$(notdir $@) $@; fi
 
 .SECONDEXPANSION:
 $(ARCH_64_TARGETS): $(DSTROOT)/%: $(SRCROOT)/$$(subst 64,,%).c
-	$(CC) $(CFLAGS) $(ARCH_64_FLAGS) $< -o $(SYMROOT)/$(notdir $@) # 64-bit fat
+	$(CC) $(CFLAGS) $(ARCH_FLAGS_64) $< -o $(SYMROOT)/$(notdir $@) # 64-bit fat
 	if [ ! -e $@ ]; then ditto $(SYMROOT)/$(notdir $@) $@; fi
 
 clean:
-	rm -f $(TARGETS) 
+	rm -f $(TARGETS)
 	rm -rf $(SYMROOT)/*.dSYM