Fri Sep 9 10:58:15 2022 UTC ()
bootstrap: Remove old -isystem hack on macOS.

This was introduced many years ago in PR#26143 to try and work around a
misconfiguration in how Apple's GCC was built at the time.  Newer compilers no
longer look in /usr/local/include, and this workaround can now be harmful when
trying to pick a specific SDK to build against.


(jperkin)
diff -r1.312 -r1.313 pkgsrc/bootstrap/bootstrap
cvs diff -r1.312 -r1.313 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2022/06/16 22:12:20 1.312
+++ pkgsrc/bootstrap/bootstrap 2022/09/09 10:58:15 1.313
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.312 2022/06/16 22:12:20 charlotte Exp $ 3# $NetBSD: bootstrap,v 1.313 2022/09/09 10:58:15 jperkin Exp $
4# 4#
5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> 5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
6# All rights reserved. 6# All rights reserved.
7# 7#
8# Redistribution and use in source and binary forms, with or without 8# Redistribution and use in source and binary forms, with or without
9# modification, are permitted provided that the following conditions 9# modification, are permitted provided that the following conditions
10# are met: 10# are met:
11# 1. Redistributions of source code must retain the above copyright 11# 1. Redistributions of source code must retain the above copyright
12# notice, this list of conditions and the following disclaimer. 12# notice, this list of conditions and the following disclaimer.
13# 2. Redistributions in binary form must reproduce the above copyright 13# 2. Redistributions in binary form must reproduce the above copyright
14# notice, this list of conditions and the following disclaimer in the 14# notice, this list of conditions and the following disclaimer in the
15# documentation and/or other materials provided with the distribution. 15# documentation and/or other materials provided with the distribution.
16# 16#
@@ -577,27 +577,26 @@ CYGWIN_*) @@ -577,27 +577,26 @@ CYGWIN_*)
577 } 577 }
578 root_user=Administrators 578 root_user=Administrators
579 root_group=Administrators 579 root_group=Administrators
580 opsys=`uname -o` 580 opsys=`uname -o`
581 need_sed=yes 581 need_sed=yes
582 machine_arch=`uname -m` 582 machine_arch=`uname -m`
583 # only used for unprivileged builds. 583 # only used for unprivileged builds.
584 whoamiprog='id -u' 584 whoamiprog='id -u'
585 groupsprog='id -g' 585 groupsprog='id -g'
586 ;; 586 ;;
587Darwin) 587Darwin)
588 root_group=wheel 588 root_group=wheel
589 machine_arch=`get_machine_arch_darwin` 589 machine_arch=`get_machine_arch_darwin`
590 CC=${CC:-"cc -isystem /usr/include"}; export CC 
591 check_compiler=yes 590 check_compiler=yes
592 591
593 # Combine major.minor product version for simpler numerical tests. 592 # Combine major.minor product version for simpler numerical tests.
594 macos_version=`sw_vers -productVersion | \ 593 macos_version=`sw_vers -productVersion | \
595 awk -F. '{ printf("%02d%02d", $1, $2) }'` 594 awk -F. '{ printf("%02d%02d", $1, $2) }'`
596 595
597 # Since 10.9, native sed exits when called on files with UTF-8 596 # Since 10.9, native sed exits when called on files with UTF-8
598 # or other apparently-binary content. 597 # or other apparently-binary content.
599 if [ $macos_version -ge 1008 ]; then 598 if [ $macos_version -ge 1008 ]; then
600 need_awk=yes 599 need_awk=yes
601 need_sed=yes 600 need_sed=yes
602 fi 601 fi
603 602