diff options
Diffstat (limited to 'sdks/builds/ios.mk')
-rw-r--r-- | sdks/builds/ios.mk | 120 |
1 files changed, 1 insertions, 119 deletions
diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk index 28752f2c3ae..f09b176e335 100644 --- a/sdks/builds/ios.mk +++ b/sdks/builds/ios.mk @@ -12,7 +12,6 @@ ios_FRAMEWORKS_DIR = $(TOP)/sdks/out/ios-frameworks ios_LIBS_DIR = $(TOP)/sdks/out/ios-libs -ios_NETCORE_LIBS_DIR = $(TOP)/sdks/out/ios-netcore_libs ios_SOURCES_DIR = $(TOP)/sdks/out/ios-sources ios_TPN_DIR = $(TOP)/sdks/out/ios-tpn ios_MONO_VERSION = $(TOP)/sdks/out/ios-mono-version.txt @@ -22,11 +21,6 @@ ios_ARCHIVE += ios-frameworks ios-libs ios-sources ios-tpn ios-mono-version.txt ADDITIONAL_PACKAGE_DEPS += $(ios_FRAMEWORKS_DIR) $(ios_LIBS_DIR) $(ios_SOURCES_DIR) $(ios_TPN_DIR) $(ios_MONO_VERSION) endif -ifdef ENABLE_NETCORE -ios_ARCHIVE += ios-netcore_libs -ADDITIONAL_PACKAGE_DEPS += $(ios_NETCORE_LIBS_DIR) -endif - ios_PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin ## @@ -211,44 +205,6 @@ ios-targettv_AC_VARS = \ ios-targetwatch_AC_VARS = $(ios-targettv_AC_VARS) ios-targetwatch64_32_AC_VARS = $(ios-targettv_AC_VARS) -# --- NETCORE ---- -ios-netcore_target32_CONFIGURE_FLAGS = --with-core=only -ios-netcore_target32s_CONFIGURE_FLAGS = --with-core=only -ios-netcore_target64_CONFIGURE_FLAGS = --with-core=only -ios-netcore_targettv_CONFIGURE_FLAGS = $(ios-targettv_CONFIGURE_FLAGS) --with-core=only -ios-netcore_targetwatch_CONFIGURE_FLAGS = $(ios-targetwatch_CONFIGURE_FLAGS) --with-core=only -ios-netcore_targetwatch64_32_CONFIGURE_FLAGS = $(ios-targetwatch64_32_CONFIGURE_FLAGS) --with-core=only - -ios-netcore_target32_SYSROOT = $(ios-target32_SYSROOT) -ios-netcore_target32s_SYSROOT = $(ios-target32s_SYSROOT) -ios-netcore_target64_SYSROOT = $(ios-target64_SYSROOT) -ios-netcore_targettv_SYSROOT = $(ios-targettv_SYSROOT) -ios-netcore_targetwatch_SYSROOT = $(ios-targetwatch_SYSROOT) -ios-netcore_targetwatch64_32_SYSROOT = $(ios-targetwatch64_32_SYSROOT) - -ios-netcore_target32_CPPFLAGS = $(ios-target32_CPPFLAGS) -ios-netcore_target32s_CPPFLAGS = $(ios-target32s_CPPFLAGS) -ios-netcore_target64_CPPFLAGS = $(ios-target64_CPPFLAGS) -ios-netcore_targettv_CPPFLAGS = $(ios-targettv_CPPFLAGS) -ios-netcore_targetwatch_CPPFLAGS = $(ios-targetwatch_CPPFLAGS) -ios-netcore_targetwatch64_32_CPPFLAGS = $(ios-targetwatch64_32_CPPFLAGS) - -ios-netcore_targettv_CFLAGS = $(ios-targettv_CFLAGS) -ios-netcore_targettv_CXXFLAGS = $(ios-targettv_CXXFLAGS) -ios-netcore_targetwatch_CFLAGS = $(ios-targetwatch_CFLAGS) -ios-netcore_targetwatch_CXXFLAGS = $(ios-targetwatch_CXXFLAGS) -ios-netcore_targetwatch64_32_CFLAGS = $(ios-targetwatch64_32_CFLAGS) -ios-netcore_targetwatch64_32_CXXFLAGS = $(ios-targetwatch64_32_CXXFLAGS) - -ios-netcore_targettv_LDFLAGS = $(ios-targettv_LDFLAGS) -ios-netcore_targetwatch_LDFLAGS = $(ios-targetwatch_LDFLAGS) -ios-netcore_targetwatch64_32_LDFLAGS = $(ios-targetwatch64_32_LDFLAGS) - -ios-netcore_targettv_AC_VARS = $(ios-targettv_AC_VARS) -ios-netcore_targetwatch_AC_VARS =$(ios-targetwatch_AC_VARS) -ios-netcore_targetwatch64_32_AC_VARS = $(ios-targetwatch64_32_AC_VARS) - - ifndef DISABLE_CLASSIC # ios-target32_BITCODE_MARKER=-fembed-bitcode-marker $(eval $(call iOSDeviceTemplate,target32,arm-apple-darwin10,armv7)) @@ -260,17 +216,6 @@ $(eval $(call iOSDeviceTemplate,targetwatch,armv7k-apple-darwin10,armv7k)) $(eval $(call iOSDeviceTemplate,targetwatch64_32,aarch64-apple-darwin10_ilp32,arm64_32)) endif -ifdef ENABLE_NETCORE -# ios-netcore_target32_BITCODE_MARKER=-fembed-bitcode-marker -$(eval $(call iOSDeviceTemplate,netcore_target32,arm-apple-darwin10,armv7)) -$(eval $(call iOSDeviceTemplate,netcore_target32s,arm-apple-darwin10,armv7s)) -# ios-netcore_target64_BITCODE_MARKER=-fembed-bitcode-marker -$(eval $(call iOSDeviceTemplate,netcore_target64,aarch64-apple-darwin10,arm64)) -$(eval $(call iOSDeviceTemplate,netcore_targettv,aarch64-apple-darwin10,arm64)) -$(eval $(call iOSDeviceTemplate,netcore_targetwatch,armv7k-apple-darwin10,armv7k)) -$(eval $(call iOSDeviceTemplate,netcore_targetwatch64_32,aarch64-apple-darwin10_ilp32,arm64_32)) -endif - ## # Simulator builds # @@ -398,29 +343,6 @@ ios-simwatch64_AC_VARS = \ ac_cv_func_execvp=no \ ac_cv_func_signal=no -# --- NETCORE ---- -ios-netcore_sim32_SYSROOT = $(ios-sim32_SYSROOT) -ios-netcore_sim64_SYSROOT = $(ios-sim64_SYSROOT) -ios-netcore_simtv_SYSROOT = $(ios-simtv_SYSROOT) -ios-netcore_simwatch_SYSROOT = $(ios-simwatch_SYSROOT) -ios-netcore_simwatch64_SYSROOT = $(ios-simwatch64_SYSROOT) - -ios-netcore_sim32_CONFIGURE_FLAGS = --with-core=only -ios-netcore_sim64_CONFIGURE_FLAGS = --with-core=only -ios-netcore_simtv_CONFIGURE_FLAGS = --with-core=only -ios-netcore_simwatch_CONFIGURE_FLAGS = $(ios-simwatch_CONFIGURE_FLAGS) --with-core=only -ios-netcore_simwatch64_CONFIGURE_FLAGS = $(ios-simwatch64_CONFIGURE_FLAGS) --with-core=only - -ios-netcore_sim32_CPPFLAGS = $(ios-sim32_CPPFLAGS) -ios-netcore_sim64_CPPFLAGS = $(ios-sim64_CPPFLAGS) -ios-netcore_simtv_CPPFLAGS = $(ios-simtv_CPPFLAGS) -ios-netcore_simwatch_CPPFLAGS = $(ios-simwatch_CPPFLAGS) -ios-netcore_simwatch64_CPPFLAGS = $(ios-simwatch64_CPPFLAGS) - -ios-netcore_simtv_AC_VARS = $(ios-simtv_AC_VARS) -ios-netcore_simwatch_AC_VARS = $(ios-simwatch_AC_VARS) -ios-netcore_simwatch64_AC_VARS = $(ios-simwatch64_AC_VARS) - ifndef DISABLE_CLASSIC $(eval $(call iOSSimulatorTemplate,sim32,i386-apple-darwin10,i386)) @@ -430,14 +352,6 @@ $(eval $(call iOSSimulatorTemplate,simwatch,i386-apple-darwin10,i386)) $(eval $(call iOSSimulatorTemplate,simwatch64,x86_64-apple-darwin10,x86_64)) endif -ifdef ENABLE_NETCORE -$(eval $(call iOSSimulatorTemplate,netcore_sim32,i386-apple-darwin10,i386)) -$(eval $(call iOSSimulatorTemplate,netcore_sim64,x86_64-apple-darwin10,x86_64)) -$(eval $(call iOSSimulatorTemplate,netcore_simtv,x86_64-apple-darwin10,x86_64)) -$(eval $(call iOSSimulatorTemplate,netcore_simwatch,i386-apple-darwin10,i386)) -$(eval $(call iOSSimulatorTemplate,netcore_simwatch64,x86_64-apple-darwin10,x86_64)) -endif - ## # Cross compiler builds # @@ -507,18 +421,6 @@ ios-crosswatch64_32_SYSROOT=-isysroot $(XCODE_DIR)/Platforms/MacOSX.platform/Dev ios-crosswatch_CONFIGURE_FLAGS=--enable-cooperative-suspend -# --- NETCORE ---- -ios-netcore_cross32_SYSROOT = $(ios-cross32_SYSROOT) -ios-netcore_crosswatch_SYSROOT = $(ios-crosswatch_SYSROOT) -ios-netcore_cross64_SYSROOT = $(ios-cross64_SYSROOT) -ios-netcore_crosswatch64_32_SYSROOT = $(ios-crosswatch64_32_SYSROOT) - -ios-netcore_cross32_CONFIGURE_FLAGS = --with-core=only -ios-netcore_crosswatch_CONFIGURE_FLAGS = $(ios-crosswatch_CONFIGURE_FLAGS) --with-core=only -ios-netcore_cross64_CONFIGURE_FLAGS = --with-core=only -ios-netcore_crosswatch64_32_CONFIGURE_FLAGS = --with-core=only - - ifndef DISABLE_CLASSIC $(eval $(call iOSCrossTemplate,cross32,x86_64,arm-darwin,target32,llvm-llvm64,arm-apple-darwin10,$(ios_sysroot_path))) $(eval $(call iOSCrossTemplate,cross64,x86_64,aarch64-darwin,target64,llvm-llvm64,aarch64-apple-darwin10,$(ios_sysroot_path))) @@ -526,14 +428,6 @@ $(eval $(call iOSCrossTemplate,crosswatch,x86_64,armv7k-unknown-darwin,targetwat $(eval $(call iOSCrossTemplate,crosswatch64_32,x86_64,aarch64-apple-darwin10_ilp32,targetwatch64_32,llvm-llvm64,aarch64-apple-darwin10_ilp32,$(watchos64_32_sysroot_path))) endif -ifdef ENABLE_NETCORE -$(eval $(call iOSCrossTemplate,netcore_cross32,x86_64,arm-darwin,netcore_target32,llvm-llvm64,arm-apple-darwin10,$(ios_sysroot_path))) -$(eval $(call iOSCrossTemplate,netcore_cross64,x86_64,aarch64-darwin,netcore_target64,llvm-llvm64,aarch64-apple-darwin10,$(ios_sysroot_path))) -$(eval $(call iOSCrossTemplate,netcore_crosswatch,x86_64,armv7k-unknown-darwin,netcore_targetwatch,llvm-llvm64,armv7k-apple-darwin,$(watchos_sysroot_path))) -$(eval $(call iOSCrossTemplate,netcore_crosswatch64_32,x86_64,aarch64-apple-darwin10_ilp32,netcore_targetwatch64_32,llvm-llvm64,aarch64-apple-darwin10_ilp32,$(watchos64_32_sysroot_path))) -endif - - $(ios_FRAMEWORKS_DIR): package-ios-target32 package-ios-target32s package-ios-target64 package-ios-targettv package-ios-targetwatch package-ios-targetwatch64_32 package-ios-sim32 package-ios-sim64 package-ios-simtv package-ios-simwatch package-ios-simwatch64 $(TOP)/sdks/builds/ios-Mono.framework-Info.plist $(TOP)/sdks/builds/ios-Mono.framework-tvos.Info.plist $(TOP)/sdks/builds/ios-Mono.framework-watchos.Info.plist $(TOP)/sdks/out/ios-target32-$(CONFIGURATION)/lib/libmonosgen-2.0-minversion80.dylib $(TOP)/sdks/out/ios-target32s-$(CONFIGURATION)/lib/libmonosgen-2.0-minversion80.dylib $(TOP)/sdks/out/ios-target64-$(CONFIGURATION)/lib/libmonosgen-2.0-minversion80.dylib rm -rf $(ios_FRAMEWORKS_DIR) @@ -718,7 +612,7 @@ $(ios_LIBS_DIR): package-ios-target32 package-ios-target32s package-ios-target64 $(ios_SOURCES_DIR)/mcs/build/common/Consts.cs: # we use this as a sentinel file to avoid rsyncing everything on each build (slows down iterating) mkdir -p $(ios_SOURCES_DIR) - cd $(TOP) && rsync -r --exclude='external/api-doc-tools/*' --exclude='external/api-snapshot/*' --exclude='external/aspnetwebstack/*' --exclude='external/binary-reference-assemblies/*' --exclude='netcore/*' --include='*.cs' --include='*/' --exclude="*" --prune-empty-dirs . $(ios_SOURCES_DIR) + cd $(TOP) && rsync -r --exclude='external/api-doc-tools/*' --exclude='external/api-snapshot/*' --exclude='external/aspnetwebstack/*' --exclude='external/binary-reference-assemblies/*' --include='*.cs' --include='*/' --exclude="*" --prune-empty-dirs . $(ios_SOURCES_DIR) $(ios_SOURCES_DIR): $(ios_SOURCES_DIR)/mcs/build/common/Consts.cs @@ -738,15 +632,3 @@ $(ios_MONO_VERSION): $(TOP)/configure.ac ifndef DISABLE_CLASSIC $(eval $(call BclTemplate,ios,monotouch monotouch_runtime monotouch_tv monotouch_tv_runtime monotouch_watch monotouch_watch_runtime monotouch_tools,monotouch monotouch_tv monotouch_watch)) endif - -ifdef ENABLE_NETCORE -$(ios_NETCORE_LIBS_DIR): package-ios-netcore_target32 package-ios-netcore_target32s package-ios-netcore_target64 package-ios-netcore_targettv package-ios-netcore_targetwatch package-ios-netcore_targetwatch64_32 package-ios-netcore_sim32 package-ios-netcore_sim64 package-ios-netcore_simtv package-ios-netcore_simwatch - cp $(DOTNET_RUNTIME_REPO_DIR)/artifacts/bin/runtime/netcoreapp-iOSSimulator-Debug-appleuniversal/System.*.dylib $(DOTNET_RUNTIME_REPO_DIR)/artifacts/bin/runtime/netcoreapp-iOSSimulator-Debug-appleuniversal/System.*.a $(TOP)/sdks/out/ios-netcore_sim64-$(CONFIGURATION)/lib - cp $(DOTNET_RUNTIME_REPO_DIR)/artifacts/bin/runtime/netcoreapp-iOSDevice-Debug-appleuniversal/System.*.dylib $(DOTNET_RUNTIME_REPO_DIR)/artifacts/bin/runtime/netcoreapp-iOSDevice-Debug-appleuniversal/System.*.a $(TOP)/sdks/out/ios-netcore_target64-$(CONFIGURATION)/lib - mkdir -p $(TOP)/sdks/out/ios-netcore_libs/ios/ - cp $(DOTNET_RUNTIME_REPO_DIR)/artifacts/bin/runtime/netcoreapp-iOSSimulator-Debug-appleuniversal/*.dll $(DOTNET_RUNTIME_REPO_DIR)/artifacts/bin/runtime/netcoreapp-iOSSimulator-Debug-appleuniversal/*.pdb $(TOP)/sdks/out/ios-netcore_libs/ios/ - cp $(TOP)/sdks/builds/ios-netcore_sim64-$(CONFIGURATION)/netcore/config.make $(TOP)/netcore - $(MAKE) -C $(TOP)/netcore bcl - cp $(TOP)/netcore/System.Private.CoreLib/bin/x64/System.Private.CoreLib.dll $(TOP)/sdks/out/ios-netcore_libs/ios/ - cp $(TOP)/netcore/System.Private.CoreLib/bin/x64/System.Private.CoreLib.pdb $(TOP)/sdks/out/ios-netcore_libs/ios/ -endif |