Fix arch build dir for iPhone
For the iPhone platform the ARCH_BUILD_DIR was used instead of ARCH_BUILD_IPHONE_DIR. That
caused that the build and dist output was placed in the root directory instead of in a subfolder
like all other platforms.
Except the inconsistency there might be issues with rules depending on the platform.
@@ -267,7 +267,7 @@ emit_arch_specific_compile_rules = $(foreach arch,$(XCODE_ARCHS),\
else
# Targets specific to a command-line build
-FAT_LIB_IOS_ARCHS = $(filter-out simulator64 macos% maccatalyst% appletv% watch%,$(J2OBJC_ARCHS))
+FAT_LIB_IOS_ARCHS = $(filter iphone%,$(J2OBJC_ARCHS))
FAT_LIB_SIMULATOR_ARCHS = $(filter simulator%,$(J2OBJC_ARCHS))
FAT_LIB_MAC_ARCHS = $(filter macos%,$(J2OBJC_ARCHS))
FAT_LIB_WATCH_ARCHS = $(filter watch%,$(J2OBJC_ARCHS))
@@ -277,8 +277,8 @@ FAT_LIB_MAC_CATALYST_ARCHS = $(filter maccatalyst%,$(J2OBJC_ARCHS))
emit_library_rules = $(foreach arch,$(J2OBJC_ARCHS),\
$(eval $(call arch_lib_rule,$(BUILD_DIR)/objs-$(arch),$(1),$(2)))) \
$(if $(FAT_LIB_IOS_ARCHS),\
- $(eval $(call fat_lib_rule,$(1),$(FAT_LIB_IOS_ARCHS:%=$(BUILD_DIR)/objs-%/lib$(1).a))) \
- $(ARCH_BUILD_DIR)/lib$(1).a,) \
+ $(eval $(call iphone_lib_rule,$(1),$(FAT_LIB_IOS_ARCHS:%=$(BUILD_DIR)/objs-%/lib$(1).a))) \
+ $(ARCH_BUILD_IPHONE_DIR)/lib$(1).a,) \
$(if $(FAT_LIB_SIMULATOR_ARCHS),\
$(eval $(call simulator_lib_rule,$(1),$(FAT_LIB_SIMULATOR_ARCHS:%=$(BUILD_DIR)/objs-%/lib$(1).a))) \
$(ARCH_BUILD_SIMULATOR_DIR)/lib$(1).a,) \
