Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 16:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/configure.sh: Another fix for the script. The last change only worked for Windows Cygwin; for Linux, it needed to remove some additional things from the defconfig file.

Browse Source
This commit is contained in:
Gregory Nutt
2017-10-01 14:24:57 -06:00
parent e505df2eb5
commit 9eca03b9be
5 changed files with 44 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/configure.sh
+13 -18
View File
@@ -266,45 +266,40 @@ if [ "X${defappdir}" = "Xy" ]; then
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_OTHER/d" ${dest_config}
sed -i -e "/CONFIG_WINDOWS_NATIVE/d" ${dest_config}
sed -i -e "/CONFIG_WINDOWS_CYGWIN/d" ${dest_config}
sed -i -e "/CONFIG_WINDOWS_MSYS/d" ${dest_config}
sed -i -e "/CONFIG_WINDOWS_UBUNTU/d" ${dest_config}
sed -i -e "/CONFIG_WINDOWS_OTHER/d" ${dest_config}
sed -i -e "/CONFIG_SIM_X8664_MICROSOFT/d" ${dest_config}
sed -i -e "/CONFIG_SIM_X8664_SYSTEMV/d" ${dest_config}
sed -i -e "/CONFIG_SIM_M32/d" ${dest_config}
if [ "$host" == "linux" ]; then
echo " Select CONFIG_HOST_LINUX=y"
sed -i -e "/CONFIG_HOST_WINDOWS/d" ${dest_config}
sed -i -e "/CONFIG_SIM_X8664_MICROSOFT/d" ${dest_config}
sed -i -e "/CONFIG_SIM_M32/d" ${dest_config}
echo "CONFIG_HOST_LINUX=y" >> "${dest_config}"
echo "CONFIG_SIM_X8664_SYSTEMV=y" >> "${dest_config}"
else
else
echo " Select CONFIG_HOST_WINDOWS=y"
sed -i -e "/CONFIG_HOST_LINUX/d" ${dest_config}
sed -i -e "/CONFIG_WINDOWS_MSYS/d" ${dest_config}
sed -i -e "/CONFIG_WINDOWS_OTHER/d" ${dest_config}
sed -i -e "/CONFIG_SIM_X8664_SYSTEMV/d" ${dest_config}
echo "CONFIG_HOST_WINDOWS=y" >> "${dest_config}"
echo "CONFIG_SIM_X8664_MICROSOFT=y" >> "${dest_config}"
if [ "X$wenv" == "Xcygwin" ]; then
echo " Select CONFIG_WINDOWS_CYGWIN=y"
sed -i -e "/CONFIG_WINDOWS_UBUNTU/d" ${dest_config}
sed -i -e "/CONFIG_WINDOWS_NATIVE/d" ${dest_config}
echo "CONFIG_WINDOWS_CYGWIN=y" >> "${dest_config}"
else
sed -i -e "/CONFIG_WINDOWS_CYGWIN/d" ${dest_config}
if [ "X$wenv" == "Xubuntu" ]; then
echo " Select CONFIG_WINDOWS_UBUNTU=y"
sed -i -e "/CONFIG_WINDOWS_UBUNTU/d" ${dest_config}
echo "CONFIG_WINDOWS_UBUNTU=y" >> "${dest_config}"
else
echo " Select CONFIG_WINDOWS_NATIVE=y"
sed -i -e "/CONFIG_WINDOWS_NATIVE/d" ${dest_config}
echo "CONFIG_WINDOWS_NATIVE=y" >> "${dest_config}"
fi
fi