Don't build macOS 32-bit binaries anymore.

Author: TautvydasZilys

external/buildscripts/build_all_osx.pl

@@ -51,13 +51,6 @@
 	'buildusandboo=i'=>\$buildUsAndBoo,
 );
 
-my $monoArch32Target = "i386";
-if ($buildMachine)
-{
-	print(">>> Building $monoArch32Target\n");
-	system("perl", "$buildscriptsdir/build.pl", "--arch32=1", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ("failing building $monoArch32Target");
-}
-
 if ($artifactsCommon)
 {
 	push @passAlongArgs, "--artifactscommon=1";
@@ -73,20 +66,14 @@
 
 if ($artifact)
 {
-	print(">>> Creating universal binaries\n");
+	print(">>> Moving built binaries to final output directories\n");
 	# Merge stuff in the embedruntimes directory
 	my $embedDirRoot = "$buildsroot/embedruntimes";
 	my $embedDirDestination = "$embedDirRoot/osx";
-	my $embedDirSource32 = "$embedDirRoot/osx-tmp-$monoArch32Target";
 	my $embedDirSource64 = "$embedDirRoot/osx-tmp-x86_64";
 
 	system("mkdir -p $embedDirDestination");
 
-	if (!(-d $embedDirSource32) && $buildMachine)
-	{
-		die("Expected source directory not found : $embedDirSource32\n");
-	}
-
 	if (!(-d $embedDirSource64))
 	{
 		die("Expected source directory not found : $embedDirSource64\n");
@@ -116,7 +103,6 @@
 	my $distDirRoot = "$buildsroot/monodistribution";
 	my $distDirDestinationBin = "$buildsroot/monodistribution/bin";
 	my $distDirDestinationLib = "$buildsroot/monodistribution/lib";
-	my $distDirSourceBin32 = "$distDirRoot/bin-osx-tmp-$monoArch32Target";
 	my $distDirSourceBin64 = "$distDirRoot/bin-osx-tmp-x86_64";
 
 	# Should always exist because build_all would have put stuff in it, but in some situations
@@ -131,20 +117,14 @@
 		system("mkdir -p $distDirDestinationLib");
 	}
 
-	if (!(-d $distDirSourceBin32))
-	{
-		die("Expected source directory not found : $distDirSourceBin32\n");
-	}
-
 	if (!(-d $distDirSourceBin64))
 	{
 		die("Expected source directory not found : $distDirSourceBin64\n");
 	}
 
 	for my $file ('mono','pedump')
 	{
-		print(">>> lipo $distDirSourceBin32/$file $distDirSourceBin64/$file -create -output $distDirDestinationBin/$file\n\n");
-		system ('lipo', "$distDirSourceBin32/$file", "$distDirSourceBin64/$file", '-create', '-output', "$distDirDestinationBin/$file");
+		system ('mv', "$distDirSourceBin64/$file", "$distDirDestinationBin/$file");
 	}
 
 	for my $file ('libMonoPosixHelper.dylib')
@@ -157,9 +137,7 @@
 	{
 		print(">>> Clean up temporary arch specific build directories\n");
 
-		rmtree("$distDirSourceBin32");
 		rmtree("$distDirSourceBin64");
-		rmtree("$embedDirSource32");
 		rmtree("$embedDirSource64");
 	}
 }