[Box Backup-commit] COMMIT r3539 - box/trunk/infrastructure

subversion at boxbackup.org subversion at boxbackup.org
Sat Feb 28 19:41:38 GMT 2015


Author: jamesog
Date: 2015-02-28 19:41:37 +0000 (Sat, 28 Feb 2015)
New Revision: 3539

Modified:
   box/trunk/infrastructure/BoxPlatform.pm.in
Log:
Fix build on OS X >= 10.9, which uses GNU Make.

Also tidy up some whitespace to shut vim up.


Modified: box/trunk/infrastructure/BoxPlatform.pm.in
===================================================================
--- box/trunk/infrastructure/BoxPlatform.pm.in	2015-02-27 22:11:45 UTC (rev 3538)
+++ box/trunk/infrastructure/BoxPlatform.pm.in	2015-02-28 19:41:37 UTC (rev 3539)
@@ -8,7 +8,7 @@
 	# which OS are we building under?
 	$target_os = '@target_os@';
 	$target_windows = 0;
-	$target_windows = 1 if $target_os =~ m'^mingw32' 
+	$target_windows = 1 if $target_os =~ m'^mingw32'
 		or $target_os eq "winnt";
 
 	if ($^O eq "MSWin32" and not -x "/usr/bin/uname")
@@ -34,7 +34,7 @@
 
 	if ($build_os eq 'Darwin' and $xcode_ver < 4)
 	{
-   	$make_command = 'bsdmake';
+		$make_command = 'bsdmake';
 		$bsd_make = 1;
 	}
 	elsif ($build_os eq 'SunOS')
@@ -54,7 +54,8 @@
 	{
 		$make_command = 'make';
 		$bsd_make = ($build_os ne 'Linux' && $build_os ne 'CYGWIN' &&
-			$build_os ne "MINGW32" && $build_os ne 'GNU/kFreeBSD');
+			$build_os ne "MINGW32" && $build_os ne 'GNU/kFreeBSD' && 
+			$build_os ne 'Darwin');
 	}
 
 	# blank extra flags by default
@@ -129,7 +130,7 @@
 		print STDERR "$cpus processors detected, will set make to perform concurrent jobs\n";
 		$sub_make_options = ' -j '.($cpus + 1);
 	}
-		
+
 	# if it's Darwin,
 	if($build_os eq 'Darwin')
 	{




More information about the Boxbackup-commit mailing list