diff options
| author | James O'Gorman <james@netinertia.co.uk> | 2015-02-28 19:41:37 +0000 |
|---|---|---|
| committer | James O'Gorman <james@netinertia.co.uk> | 2015-02-28 19:41:37 +0000 |
| commit | c5ecc644d872ce15aab5ba9ce342397cfd331245 (patch) | |
| tree | 3119172513f5f62b8c3b4dde3799e944144f52c3 /infrastructure/BoxPlatform.pm.in | |
| parent | 962bc5d81acd2c69d9e791ae627cc64c6a9b5e2e (diff) | |
Fix build on OS X >= 10.9, which uses GNU Make.
Also tidy up some whitespace to shut vim up.
Diffstat (limited to 'infrastructure/BoxPlatform.pm.in')
| -rw-r--r-- | infrastructure/BoxPlatform.pm.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/infrastructure/BoxPlatform.pm.in b/infrastructure/BoxPlatform.pm.in index 3a1bf4bd..e8964b0e 100644 --- a/infrastructure/BoxPlatform.pm.in +++ b/infrastructure/BoxPlatform.pm.in @@ -8,7 +8,7 @@ BEGIN # 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 @@ BEGIN 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 @@ BEGIN { $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 @@ BEGIN 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') { |