X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=vos%2Fbuild.cm;h=8719d050c480f3dec3275fcde1ed3efcab5f23bf;hb=2aa761807d7eac561ade382b2c66eebffcdf056f;hp=937e4d78077997ccce89b5ef7e1fcfcada3eabd8;hpb=495c5fdc8fec0d7d0f72a84d44bb3e7cfc448d43;p=p5sagit%2Fp5-mst-13.2.git diff --git a/vos/build.cm b/vos/build.cm index 937e4d7..8719d05 100644 --- a/vos/build.cm +++ b/vos/build.cm @@ -32,6 +32,10 @@ &if &cpu& = pa8000 &then &set_string obj .8000 & +&if &cpu& = mc68020 +&then &set_string obj2 .68k +&else &set_string obj2 &obj& +& &set_string cpu -processor &cpu& & & If requested, compile the source code. @@ -39,72 +43,88 @@ &if &recompile& = 0 &then &goto CHECK_REBIND & -!set_library_paths include << < &POSIX&>incl incl &+ (master_disk)>system>include_library & +&if (exists *.obj -link) +&then !unlink *.obj -no_ask -brief +& & Suppress several harmless compiler warning and advice messages. +& Use -list -show_include all -show_macros both_ways when debugging. & -!cc < 0 & (module_info os_release) < 'VOS Release 14.1.0' +&then !cc <system>tcp_os>object_library&obj&) -&then &set_string tcp_objlib (master_disk)>system>tcp_os>object_library&obj& +&if (exists -directory (master_disk)>system>tcp_os>object_library&obj2&) +&then &set_string tcp_objlib (master_disk)>system>tcp_os>object_library&obj2& &else &set_string tcp_objlib (master_disk)>system>tcp_os>object_library & -&if (exists -directory (master_disk)>system>object_library&obj&) -&then &set_string objlib (master_disk)>system>object_library&obj& +&if (exists -directory (master_disk)>system>object_library&obj2&) +&then &set_string objlib (master_disk)>system>object_library&obj2& &else &set_string objlib (master_disk)>system>object_library & -&if (exists -directory (master_disk)>system>c_object_library&obj&) -&then &set_string c_objlib (master_disk)>system>c_object_library&obj& +&if (exists -directory (master_disk)>system>c_object_library&obj2&) +&then &set_string c_objlib (master_disk)>system>c_object_library&obj2& &else &set_string c_objlib (master_disk)>system>c_object_library & !set_library_paths object . &+