Merge branch 'vendor/BMAKE'
authorJohn Marino <draco@marino.st>
Sun, 22 Mar 2015 20:53:06 +0000 (21:53 +0100)
committerJohn Marino <draco@marino.st>
Sun, 22 Mar 2015 20:53:06 +0000 (21:53 +0100)
1  2 
contrib/bmake/bmake.1
contrib/bmake/main.c
contrib/bmake/meta.c
contrib/bmake/var.c

Simple merge
@@@ -917,12 -917,12 +917,12 @@@ main(int argc, char **argv
        }
  
        if (!machine_arch) {
- #if defined(MAKE_NATIVE) && defined(CTL_HW) && defined(HW_MACHINE_ARCH)
+ #if defined(MAKE_NATIVE) && defined(HAVE_SYSCTL) && defined(CTL_HW) && defined(HW_MACHINE_ARCH)
            static char machine_arch_buf[sizeof(utsname.machine)];
-           const int mib[2] = { CTL_HW, HW_MACHINE_ARCH };
+           int mib[2] = { CTL_HW, HW_MACHINE_ARCH };
            size_t len = sizeof(machine_arch_buf);
                  
 -          if (sysctl(mib, __arraycount(mib), machine_arch_buf,
 +          if (sysctl(__DECONST(int *, mib) /* XXX */, __arraycount(mib), machine_arch_buf,
                    &len, NULL, 0) < 0) {
                (void)fprintf(stderr, "%s: sysctl failed (%s).\n", progname,
                    strerror(errno));
Simple merge
Simple merge