diff options
Diffstat (limited to 'infrastructure/BoxPlatform.pm.in')
| -rw-r--r-- | infrastructure/BoxPlatform.pm.in | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/infrastructure/BoxPlatform.pm.in b/infrastructure/BoxPlatform.pm.in index f3c71308..b2b2ce43 100644 --- a/infrastructure/BoxPlatform.pm.in +++ b/infrastructure/BoxPlatform.pm.in @@ -24,13 +24,6 @@ BEGIN # Cygwin Builds usually something like CYGWIN_NT-5.0, CYGWIN_NT-5.1 # Box Backup tried on Win2000,XP only :) $build_os = 'CYGWIN' if $build_os =~ m/CYGWIN/; -<<<<<<< HEAD - - $make_command = ($build_os eq 'Darwin') ? 'bsdmake' : ($build_os eq 'SunOS') ? 'gmake' : 'make'; - - $bsd_make = ($build_os ne 'Linux' && $build_os ne 'CYGWIN' && - $build_os ne "SunOS" && $build_os ne 'GNU/kFreeBSD'); -======= $build_os = 'MINGW32' if $build_os =~ m/MINGW32/; if ($build_os eq 'Darwin') { @@ -42,7 +35,6 @@ BEGIN $bsd_make = ($build_os ne 'Linux' && $build_os ne 'CYGWIN' && $build_os ne "MINGW32" && $build_os ne "SunOS" && $build_os ne 'GNU/kFreeBSD' && $xcode_ver < 4); ->>>>>>> 0.12 # blank extra flags by default $platform_compile_line_extra = ''; @@ -96,19 +88,6 @@ BEGIN # where to put the files $install_into_dir = '@sbindir_expanded@'; -<<<<<<< HEAD - # if it's Darwin, - if($build_os eq 'Darwin') - { - # see how many processors there are, and set make flags accordingly - my $cpus = `sysctl hw.ncpu`; - if($cpus =~ m/hw.ncpu:\s(\d+)/ && $1 > 1) - { - print STDERR "$1 processors detected, will set make to perform concurrent jobs\n"; - $sub_make_options = ' -j '.($1 + 1); - } - -======= # see how many processors there are, and set make flags accordingly if($build_os eq 'Darwin' || $build_os =~ /(Free|Net|Open)BSD/) { @@ -133,7 +112,6 @@ BEGIN # if it's Darwin, if($build_os eq 'Darwin') { ->>>>>>> 0.12 # test for fink installation if(-d '/sw/include' && -d '/sw/lib') { |