Merge pull request #1300 from Unity-Technologies/unity-master-32bit-osx-buildserver-only

UnityAlex · web-flow · commit f4a8a664a6ec · 2020-05-31T08:33:38.000-04:00
only build 32bit osx on build server. Catalina doesn't support buildi…
diff --git a/external/buildscripts/build_all_osx.pl b/external/buildscripts/build_all_osx.pl
@@ -52,9 +52,11 @@
 );
 
 my $monoArch32Target = "i386";
-
-print(">>> Building $monoArch32Target\n");
-system("perl", "$buildscriptsdir/build.pl", "--arch32=1", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ("failing building $monoArch32Target");
+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)
 {
@@ -80,7 +82,7 @@
 
 	system("mkdir -p $embedDirDestination");
 
-	if (!(-d $embedDirSource32))
+	if (!(-d $embedDirSource32) && $buildMachine)
 	{
 		die("Expected source directory not found : $embedDirSource32\n");
 	}

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,11 @@`
`52`	`52`	`);`
`53`	`53`
`54`	`54`	`my $monoArch32Target = "i386";`
`55`		`-`
`56`		`-print(">>> Building $monoArch32Target\n");`
`57`		`-system("perl", "$buildscriptsdir/build.pl", "--arch32=1", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ("failing building $monoArch32Target");`
	`55`	`+if ($buildMachine)`
	`56`	`+{`
	`57`	`+ print(">>> Building $monoArch32Target\n");`
	`58`	`+ system("perl", "$buildscriptsdir/build.pl", "--arch32=1", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ("failing building $monoArch32Target");`
	`59`	`+}`
`58`	`60`
`59`	`61`	`if ($artifactsCommon)`
`60`	`62`	`{`
`@@ -80,7 +82,7 @@`
`80`	`82`
`81`	`83`	`system("mkdir -p $embedDirDestination");`
`82`	`84`
`83`		`- if (!(-d $embedDirSource32))`
	`85`	`+ if (!(-d $embedDirSource32) && $buildMachine)`
`84`	`86`	`{`
`85`	`87`	`die("Expected source directory not found : $embedDirSource32\n");`
`86`	`88`	`}`