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

subversion at boxbackup.org subversion at boxbackup.org
Thu May 24 21:01:14 BST 2012


Author: jamesog
Date: 2012-05-24 21:01:14 +0100 (Thu, 24 May 2012)
New Revision: 3110

Modified:
   box/trunk/infrastructure/BoxPlatform.pm.in
Log:
Fix BuildPlatform.pm for Mac OS X 10.7+ and Xcode >= 4.

Xcode 4 no longer includes bsdmake so only try to use this if xcodebuild -version is less than 4.


Modified: box/trunk/infrastructure/BoxPlatform.pm.in
===================================================================
--- box/trunk/infrastructure/BoxPlatform.pm.in	2012-05-04 09:38:04 UTC (rev 3109)
+++ box/trunk/infrastructure/BoxPlatform.pm.in	2012-05-24 20:01:14 UTC (rev 3110)
@@ -26,11 +26,15 @@
 	$build_os = 'CYGWIN' if $build_os =~ m/CYGWIN/;
 	$build_os = 'MINGW32' if $build_os =~ m/MINGW32/;
 
-	$make_command = ($build_os eq 'Darwin') ? 'bsdmake' : ($build_os eq 'SunOS') ? 'gmake' : 'make';
+	if ($build_os eq 'Darwin') {
+		$xcode_ver = `xcodebuild -version | awk '/^Xcode/ {print \$2}'`
+	}
 
+	$make_command = ($build_os eq 'Darwin' && $xcode_ver < 4) ? 'bsdmake' : ($build_os eq 'SunOS') ? 'gmake' : 'make';
+
 	$bsd_make = ($build_os ne 'Linux' && $build_os ne 'CYGWIN' &&
 		$build_os ne "MINGW32" && $build_os ne "SunOS"
-		&& $build_os ne 'GNU/kFreeBSD');
+		&& $build_os ne 'GNU/kFreeBSD' && $xcode_ver < 4);
 
 	# blank extra flags by default
 	$platform_compile_line_extra = '';




More information about the Boxbackup-commit mailing list