From d52c63f632025d168dabde1e3351a1c6b44451d3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 1 Jun 2018 13:25:50 -0600 Subject: [PATCH] Change all references from OSX to macOS --- Kconfig | 4 ++-- README.txt | 2 +- arch/avr/src/avr/Kconfig | 4 ++-- arch/mips/src/mips32/Kconfig | 2 +- arch/z80/src/Makefile | 2 +- arch/z80/src/z180/Kconfig | 2 +- arch/z80/src/z180/Toolchain.defs | 10 +++++----- arch/z80/src/z80/Kconfig | 2 +- arch/z80/src/z80/Toolchain.defs | 6 +++--- configs/bambino-200e/netnsh/Make.defs | 2 +- configs/bambino-200e/scripts/Make.defs | 2 +- configs/esp32-core/README.txt | 2 +- configs/lpc4330-xplorer/scripts/Make.defs | 2 +- configs/lpc4337-ws/scripts/Make.defs | 2 +- configs/lpc4357-evb/scripts/Make.defs | 2 +- configs/lpc4370-link2/scripts/Make.defs | 2 +- configs/lpcxpresso-lpc54628/scripts/Make.defs | 2 +- configs/moteino-mega/hello/defconfig | 2 +- configs/moteino-mega/nsh/defconfig | 2 +- configs/nrf52-pca10040/scripts/Make.defs | 2 +- configs/p112/scripts/Make.defs | 2 +- configs/sama5d3-xplained/README.txt | 2 +- configs/sama5d3x-ek/README.txt | 2 +- configs/sama5d4-ek/README.txt | 2 +- configs/z80sim/README.txt | 14 +++++++------- configs/z80sim/scripts/Make.defs | 2 +- tools/README.txt | 2 +- tools/configure.c | 6 +++--- tools/configure.sh | 6 +++--- tools/sethost.sh | 2 +- tools/testbuild.sh | 2 +- 31 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Kconfig b/Kconfig index f011048dc8..dcd7d11c04 100644 --- a/Kconfig +++ b/Kconfig @@ -34,8 +34,8 @@ choice config HOST_LINUX bool "Linux" -config HOST_OSX - bool "OSX" +config HOST_MACOS + bool "macOS" config HOST_WINDOWS bool "Windows" diff --git a/README.txt b/README.txt index de6bad8436..c0a150b8f5 100644 --- a/README.txt +++ b/README.txt @@ -41,7 +41,7 @@ ENVIRONMENTS ^^^^^^^^^^^^ NuttX requires a POSIX development environment such as you would find under - Linux or OSX. NuttX may also be installed and built on Windows system + Linux or macOS. NuttX may also be installed and built on Windows system if you also provide such a POSIX development environment. Options for a POSIX development environment under Windows include: diff --git a/arch/avr/src/avr/Kconfig b/arch/avr/src/avr/Kconfig index ef55b1d620..eeaafd1c29 100644 --- a/arch/avr/src/avr/Kconfig +++ b/arch/avr/src/avr/Kconfig @@ -10,7 +10,7 @@ choice prompt "Toolchain" default AVR_WINAVR_TOOLCHAIN if TOOLCHAIN_WINDOWS default AVR_BUILDROOT_TOOLCHAIN if HOST_LINUX - default AVR_CROSSPACK_TOOLCHAIN if HOST_OSX + default AVR_CROSSPACK_TOOLCHAIN if HOST_MACOS config AVR_WINAVR_TOOLCHAIN bool "WinAVR" @@ -41,7 +41,7 @@ config AVR_LINUXGCC_TOOLCHAIN config AVR_CROSSPACK_TOOLCHAIN bool "CrossPack-AVR" - depends on HOST_OSX + depends on HOST_MACOS ---help--- For OS X, the AVR CrossPack toolchain is supported: http://www.obdev.at/products/crosspack/index.html diff --git a/arch/mips/src/mips32/Kconfig b/arch/mips/src/mips32/Kconfig index ca4675ec31..c925210760 100644 --- a/arch/mips/src/mips32/Kconfig +++ b/arch/mips/src/mips32/Kconfig @@ -60,7 +60,7 @@ config MIPS32_TOOLCHAIN_PINGUINOW config MIPS32_TOOLCHAIN_PINGUINOL bool "Pinguino mips-elf toolchain under OS X or Linux" - depends on HOST_LINUX || HOST_OSX + depends on HOST_LINUX || HOST_MACOS select ARCH_TOOLCHAIN_GNU endchoice diff --git a/arch/z80/src/Makefile b/arch/z80/src/Makefile index c3e2caea77..29b97a44d1 100644 --- a/arch/z80/src/Makefile +++ b/arch/z80/src/Makefile @@ -53,7 +53,7 @@ ifeq ($(COMPILER),sdcc) include Makefile.sdccw else - # SDCC in a POSIX environment (Linux, OSX, or Cygwin/MSYS) + # SDCC in a POSIX environment (Linux, macOS, or Cygwin/MSYS) include Makefile.sdccl endif diff --git a/arch/z80/src/z180/Kconfig b/arch/z80/src/z180/Kconfig index f2359d4694..f1213c25e7 100644 --- a/arch/z80/src/z180/Kconfig +++ b/arch/z80/src/z180/Kconfig @@ -11,7 +11,7 @@ choice default Z180_TOOLCHAIN_SDCCL if !TOOLCHAIN_WINDOWS config Z180_TOOLCHAIN_SDCCL - bool "SDCC for Linux, MAC OSX, or Cygwin" + bool "SDCC for Linux, macOS, or Cygwin" depends on !WINDOWS_NATIVE config Z180_TOOLCHAIN_SDCCW diff --git a/arch/z80/src/z180/Toolchain.defs b/arch/z80/src/z180/Toolchain.defs index cf97558ffc..123724ef1d 100644 --- a/arch/z80/src/z180/Toolchain.defs +++ b/arch/z80/src/z180/Toolchain.defs @@ -40,11 +40,11 @@ # http://sdcc.sourceforge.net/. Source and pre-built SDCC binaries can be # downloaded from the SDCC SourceForge site: # http://sourceforge.net/projects/sdcc/files/. Pre-built binaries are -# available for Linux, MAC OSX, and for Win32. In addition, SDCC can be -# built to run on Windows as a POSIX toolchain. The various SDCC options are -# selected in the NuttX configuration with: +# available for Linux, macOS, and for Win32. In addition, SDCC can be +# built to run on Windows as a POSIX toolchain. The various SDCC options +# are selected in the NuttX configuration with: # -# CONFIG_Z180_TOOLCHAIN_SDCCL=y : SDCC for Linux, MAC OSX or Cygwin +# CONFIG_Z180_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin # CONFIG_Z180_TOOLCHAIN_SDCCW=y : SDCC for Win32 # @@ -59,7 +59,7 @@ ifeq ($(filter y, \ CONFIG_Z180_TOOLCHAIN ?= SDCCWIN32 endif -# SDCC toolchain under Linux, MAC OSX or Cygwin +# SDCC toolchain under Linux, macOS or Cygwin ifeq ($(CONFIG_Z180_TOOLCHAIN),POSIX) endif diff --git a/arch/z80/src/z80/Kconfig b/arch/z80/src/z80/Kconfig index 46b9f8c08a..be39240076 100644 --- a/arch/z80/src/z80/Kconfig +++ b/arch/z80/src/z80/Kconfig @@ -11,7 +11,7 @@ choice default Z80_TOOLCHAIN_SDCCL if !TOOLCHAIN_WINDOWS config Z80_TOOLCHAIN_SDCCL - bool "SDCC for Linux, MAC OSX, or Cygwin" + bool "SDCC for Linux, macOS, or Cygwin" depends on !WINDOWS_NATIVE config Z80_TOOLCHAIN_SDCCW diff --git a/arch/z80/src/z80/Toolchain.defs b/arch/z80/src/z80/Toolchain.defs index 90fc9944ad..02c293da24 100644 --- a/arch/z80/src/z80/Toolchain.defs +++ b/arch/z80/src/z80/Toolchain.defs @@ -40,11 +40,11 @@ # http://sdcc.sourceforge.net/. Source and pre-built SDCC binaries can be # downloaded from the SDCC SourceForge site: # http://sourceforge.net/projects/sdcc/files/. Pre-built binaries are -# available for Linux, MAC OSX, and for Win32. In addition, SDCC can be +# available for Linux, macOS, and for Win32. In addition, SDCC can be # built to run on Windows as a POSIX toolchain. The various SDCC options are # selected in the NuttX configuration with: # -# CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, MAC OSX or Cygwin +# CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin # CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32 # @@ -59,7 +59,7 @@ ifeq ($(filter y, \ CONFIG_Z80_TOOLCHAIN ?= SDCCWIN32 endif -# SDCC toolchain under Linux, MAC OSX or Cygwin +# SDCC toolchain under Linux, macOS or Cygwin ifeq ($(CONFIG_Z80_TOOLCHAIN),POSIX) endif diff --git a/configs/bambino-200e/netnsh/Make.defs b/configs/bambino-200e/netnsh/Make.defs index fc140c4e53..1aee56a954 100644 --- a/configs/bambino-200e/netnsh/Make.defs +++ b/configs/bambino-200e/netnsh/Make.defs @@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y) LDSCRIPT = cs0flash.ld endif -# Setup for Windows vs Linux/Cygwin/OSX environments +# Setup for Windows vs Linux/Cygwin/macOS environments ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/bambino-200e/scripts/Make.defs b/configs/bambino-200e/scripts/Make.defs index 91b1cc6d40..3c95a022da 100644 --- a/configs/bambino-200e/scripts/Make.defs +++ b/configs/bambino-200e/scripts/Make.defs @@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y) LDSCRIPT = cs0flash.ld endif -# Setup for Windows vs Linux/Cygwin/OSX environments +# Setup for Windows vs Linux/Cygwin/macOS environments ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/esp32-core/README.txt b/configs/esp32-core/README.txt index a0d606941e..f7ade81f14 100644 --- a/configs/esp32-core/README.txt +++ b/configs/esp32-core/README.txt @@ -280,7 +280,7 @@ OpenOCD for the ESP32 Then look at the README and the docs/INSTALL.txt files in the openocd-esp32 directory for further instructions. There area - separate README files for Linux/Cygwin, OSX, and Windows. Here + separate README files for Linux/Cygwin, macOS, and Windows. Here is what I ended up doing (under Linux): cd openocd-esp32 diff --git a/configs/lpc4330-xplorer/scripts/Make.defs b/configs/lpc4330-xplorer/scripts/Make.defs index e64f3b6289..a1bfd218a2 100644 --- a/configs/lpc4330-xplorer/scripts/Make.defs +++ b/configs/lpc4330-xplorer/scripts/Make.defs @@ -55,7 +55,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y) LDSCRIPT = cs0flash.ld endif -# Setup for Windows vs Linux/Cygwin/OSX environments +# Setup for Windows vs Linux/Cygwin/macOS environments ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/lpc4337-ws/scripts/Make.defs b/configs/lpc4337-ws/scripts/Make.defs index 7ac12e0aca..4f3ea4acba 100644 --- a/configs/lpc4337-ws/scripts/Make.defs +++ b/configs/lpc4337-ws/scripts/Make.defs @@ -55,7 +55,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y) LDSCRIPT = cs0flash.ld endif -# Setup for Windows vs Linux/Cygwin/OSX environments +# Setup for Windows vs Linux/Cygwin/macOS environments ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/lpc4357-evb/scripts/Make.defs b/configs/lpc4357-evb/scripts/Make.defs index 4c97391a5b..dbafe70379 100644 --- a/configs/lpc4357-evb/scripts/Make.defs +++ b/configs/lpc4357-evb/scripts/Make.defs @@ -55,7 +55,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y) LDSCRIPT = cs0flash.ld endif -# Setup for Windows vs Linux/Cygwin/OSX environments +# Setup for Windows vs Linux/Cygwin/macOS environments ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/lpc4370-link2/scripts/Make.defs b/configs/lpc4370-link2/scripts/Make.defs index 872dbfb626..b9670ecd7a 100644 --- a/configs/lpc4370-link2/scripts/Make.defs +++ b/configs/lpc4370-link2/scripts/Make.defs @@ -55,7 +55,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y) LDSCRIPT = cs0flash.ld endif -# Setup for Windows vs Linux/Cygwin/OSX environments +# Setup for Windows vs Linux/Cygwin/macOS environments ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/lpcxpresso-lpc54628/scripts/Make.defs b/configs/lpcxpresso-lpc54628/scripts/Make.defs index 7c988d476b..740ccae931 100644 --- a/configs/lpcxpresso-lpc54628/scripts/Make.defs +++ b/configs/lpcxpresso-lpc54628/scripts/Make.defs @@ -41,7 +41,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs LDSCRIPT = flash.ld -# Setup for Windows vs Linux/Cygwin/OSX environments +# Setup for Windows vs Linux/Cygwin/macOS environments ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/moteino-mega/hello/defconfig b/configs/moteino-mega/hello/defconfig index 47fd8ee16e..adc2e95eac 100644 --- a/configs/moteino-mega/hello/defconfig +++ b/configs/moteino-mega/hello/defconfig @@ -15,7 +15,7 @@ CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y CONFIG_DISABLE_SIGNALS=y CONFIG_EXAMPLES_HELLO=y -CONFIG_HOST_OSX=y +CONFIG_HOST_MACOS=y CONFIG_IDLETHREAD_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=4 diff --git a/configs/moteino-mega/nsh/defconfig b/configs/moteino-mega/nsh/defconfig index 48ceb8c916..a246ed1ab5 100644 --- a/configs/moteino-mega/nsh/defconfig +++ b/configs/moteino-mega/nsh/defconfig @@ -17,7 +17,7 @@ CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POLL=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_NSH=y -CONFIG_HOST_OSX=y +CONFIG_HOST_MACOS=y CONFIG_IDLETHREAD_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=8 diff --git a/configs/nrf52-pca10040/scripts/Make.defs b/configs/nrf52-pca10040/scripts/Make.defs index e9a5b04763..458e6b774e 100644 --- a/configs/nrf52-pca10040/scripts/Make.defs +++ b/configs/nrf52-pca10040/scripts/Make.defs @@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs LDSCRIPT = flash_config.ld -# Setup for Windows vs Linux/Cygwin/OSX environments +# Setup for Windows vs Linux/Cygwin/macOS environments ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/p112/scripts/Make.defs b/configs/p112/scripts/Make.defs index fdc0265ffa..43da55efb6 100644 --- a/configs/p112/scripts/Make.defs +++ b/configs/p112/scripts/Make.defs @@ -157,7 +157,7 @@ else MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh - # SDCC for Linux, OSX, or Cygwin understands symbolic links. Windows SDCC + # SDCC for Linux, macOS, or Cygwin understands symbolic links. Windows SDCC # running under Cygwin does not ifeq ($(WINTOOL),y) diff --git a/configs/sama5d3-xplained/README.txt b/configs/sama5d3-xplained/README.txt index 0d3ab36cbc..603f590368 100644 --- a/configs/sama5d3-xplained/README.txt +++ b/configs/sama5d3-xplained/README.txt @@ -89,7 +89,7 @@ Development Environment Several possible development environments may be used: - - Linux or OSX native + - Linux or macOS native - Cygwin unders Windows - MinGW + MSYS under Windows - Windows native (with GNUMake from GNUWin32). diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt index f45d2fb1e8..3c0062a0d3 100644 --- a/configs/sama5d3x-ek/README.txt +++ b/configs/sama5d3x-ek/README.txt @@ -111,7 +111,7 @@ Development Environment Several possible development environments may be used: - - Linux or OSX native + - Linux or macOS native - Cygwin unders Windows - MinGW + MSYS under Windows - Windows native (with GNUMake from GNUWin32). diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt index 3a5cb4412c..62ecb80518 100644 --- a/configs/sama5d4-ek/README.txt +++ b/configs/sama5d4-ek/README.txt @@ -105,7 +105,7 @@ Development Environment Several possible development environments may be used: - - Linux or OSX native + - Linux or macOS native - Cygwin unders Windows - MinGW + MSYS under Windows - Windows native (with GNUMake from GNUWin32). diff --git a/configs/z80sim/README.txt b/configs/z80sim/README.txt index 13254a74a4..b08fb31e06 100644 --- a/configs/z80sim/README.txt +++ b/configs/z80sim/README.txt @@ -12,7 +12,7 @@ Contents o Configuring NuttX o Reconfiguring NuttX - o Reconfiguring for Windows Native, Cygwin, or OSX + o Reconfiguring for Windows Native, Cygwin, or macOS o SDCC o Building the SDCC toolchain @@ -51,7 +51,7 @@ Configuring NuttX 2. The default setup for this configuration builds under Linux. See the section entitled "Reconfiguring for Windows Native, Cygwin, - or OSX" which will give you the steps you would need to do to convert + or macOS" which will give you the steps you would need to do to convert this configuration to build in other environments. 3. This configuration was last verified sucessfully prior to the @@ -93,7 +93,7 @@ Configuring NuttX 2. The default setup for this configuration uses a windows native build. See the section entitled "Reconfiguring for Windows Native, Cygwin, - or OSX" which will give you the steps you would need to do to convert + or macOS" which will give you the steps you would need to do to convert this configuration to build in other environments. 3. This configuration was last verified sucessfully prior to the @@ -136,7 +136,7 @@ Configuring NuttX 2. The default setup for this configuration uses a windows native build. See the section entitled "Reconfiguring for Windows Native, Cygwin, - or OSX" which will give you the steps you would need to do to convert + or macOS" which will give you the steps you would need to do to convert this configuration to build in other environments. 3. This configuration was last verified sucessfully prior to the @@ -155,7 +155,7 @@ tool. To change this configuration using that tool, you should: b. Execute 'make menuconfig' in nuttx/ in order to start the reconfiguration process. -Reconfiguring for Windows Native, Cygwin, or OSX +Reconfiguring for Windows Native, Cygwin, or macOS ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ All of the z80 configurations in this this directory are set up to build @@ -184,10 +184,10 @@ SDCC These z80 configurations all use the SDCC toolchain (http://sdcc.sourceforge.net/). Source and pre-built SDCC binaries can be downloaded from the SDCC SourceForge site: http://sourceforge.net/projects/sdcc/files/ . Pre-built binaries are -available for Linux, MAC OSX, and for Win32. Various SDCC options can be +available for Linux, macOS, and for Win32. Various SDCC options can be selected with: - CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, MAC OSX or Cygwin (see below) + CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin (see below) CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32 SDCC versions 3.2.0 or higher are recommended. diff --git a/configs/z80sim/scripts/Make.defs b/configs/z80sim/scripts/Make.defs index d0b46bd008..30e878f70d 100644 --- a/configs/z80sim/scripts/Make.defs +++ b/configs/z80sim/scripts/Make.defs @@ -158,7 +158,7 @@ else MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) endif - # SDCC for Linux, OSX, or Cygwin understands symbolic links. Windows SDCC + # SDCC for Linux, macOS, or Cygwin understands symbolic links. Windows SDCC # running under Cygwin does not ifeq ($(WINTOOL),y) diff --git a/tools/README.txt b/tools/README.txt index 23fcb75d3c..e70a7534a7 100644 --- a/tools/README.txt +++ b/tools/README.txt @@ -46,7 +46,7 @@ configure.c, cfgparser.c, and cfgparser.h configure.sh is a bash script that is used to configure NuttX for a given target board in a environment that supports POSIX paths (Linux, Cygwin, - OSX, or similar). See configs/README.txt or Documentation/NuttxPortingGuide.html + macOS, or similar). See configs/README.txt or Documentation/NuttxPortingGuide.html for a description of how to configure NuttX with this script. configure.c, cfgparser.c, and cfgparser.h can be used to build a work-alike diff --git a/tools/configure.c b/tools/configure.c index 569602df85..ba7f1d5600 100644 --- a/tools/configure.c +++ b/tools/configure.c @@ -996,7 +996,7 @@ static void set_host(const char *destconfig) enable_feature(destconfig, "CONFIG_HOST_LINUX"); disable_feature(destconfig, "CONFIG_HOST_WINDOWS"); - disable_feature(destconfig, "CONFIG_HOST_OSX"); + disable_feature(destconfig, "CONFIG_HOST_MACOS"); disable_feature(destconfig, "CONFIG_WINDOWS_NATIVE"); disable_feature(destconfig, "CONFIG_WINDOWS_CYGWIN"); @@ -1016,7 +1016,7 @@ static void set_host(const char *destconfig) disable_feature(destconfig, "CONFIG_HOST_LINUX"); disable_feature(destconfig, "CONFIG_HOST_WINDOWS"); - enable_feature(destconfig, "CONFIG_HOST_OSX"); + enable_feature(destconfig, "CONFIG_HOST_MACOS"); disable_feature(destconfig, "CONFIG_WINDOWS_NATIVE"); disable_feature(destconfig, "CONFIG_WINDOWS_CYGWIN"); @@ -1034,7 +1034,7 @@ static void set_host(const char *destconfig) { enable_feature(destconfig, "CONFIG_HOST_WINDOWS"); disable_feature(destconfig, "CONFIG_HOST_LINUX"); - disable_feature(destconfig, "CONFIG_HOST_OSX"); + disable_feature(destconfig, "CONFIG_HOST_MACOS"); disable_feature(destconfig, "CONFIG_WINDOWS_MSYS"); disable_feature(destconfig, "CONFIG_WINDOWS_OTHER"); diff --git a/tools/configure.sh b/tools/configure.sh index 88a8696238..f0ec51c0cf 100755 --- a/tools/configure.sh +++ b/tools/configure.sh @@ -279,7 +279,7 @@ fi if [ ! -z "$host" ]; then sed -i -e "/CONFIG_HOST_LINUX/d" ${dest_config} sed -i -e "/CONFIG_HOST_WINDOWS/d" ${dest_config} - sed -i -e "/CONFIG_HOST_OSX/d" ${dest_config} + sed -i -e "/CONFIG_HOST_MACOS/d" ${dest_config} sed -i -e "/CONFIG_HOST_OTHER/d" ${dest_config} sed -i -e "/CONFIG_WINDOWS_NATIVE/d" ${dest_config} sed -i -e "/CONFIG_WINDOWS_CYGWIN/d" ${dest_config} @@ -298,8 +298,8 @@ if [ ! -z "$host" ]; then ;; "macos") - echo " Select CONFIG_HOST_OSX=y" - echo "CONFIG_HOST_OSX=y" >> "${dest_config}" + echo " Select CONFIG_HOST_MACOS=y" + echo "CONFIG_HOST_MACOS=y" >> "${dest_config}" ;; "windows") diff --git a/tools/sethost.sh b/tools/sethost.sh index ea103db8c6..286c494491 100755 --- a/tools/sethost.sh +++ b/tools/sethost.sh @@ -233,7 +233,7 @@ else fi fi -kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_OSX +kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_MACOS kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_OTHER echo " Refreshing..." diff --git a/tools/testbuild.sh b/tools/testbuild.sh index 9d363563b4..b01b6ce0da 100755 --- a/tools/testbuild.sh +++ b/tools/testbuild.sh @@ -207,7 +207,7 @@ function configure { kconfig-tweak --file $nuttx/.config --disable CONFIG_SIM_M32 fi - kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_OSX + kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_MACOS kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_OTHER if [ "X$sizet" == "Xlong" ]; then