Index: ports/devenv/install-base-packages.sh |
diff --git a/ports/devenv/install-base-packages.sh b/ports/devenv/install-base-packages.sh |
index 17fbf4fc128f82f2cf3092a7d621a5f4c11d1d9d..5de5f050e961007b6e22e0f40672b24370ef7f96 100755 |
--- a/ports/devenv/install-base-packages.sh |
+++ b/ports/devenv/install-base-packages.sh |
@@ -9,7 +9,7 @@ |
CheckNaClEnabled() { |
# Skip check on if this isn't newlib. |
- if [[ "${TOOLCHAIN}" != newlib ]]; then |
+ if [[ ${TOOLCHAIN} != newlib ]]; then |
return |
fi |
TMP_CHECK_FILE="/tmp/.enable_nacl_check.nexe" |
@@ -42,26 +42,30 @@ CheckNaClEnabled() { |
InstallBasePackages() { |
# Core packages. |
local default_packages="\ |
+ -i corelibs \ |
+ -i nacl-spawn \ |
-i coreutils \ |
-i bash \ |
-i curl \ |
-i findutils \ |
+ -i pcre \ |
-i grep \ |
-i git \ |
-i less \ |
-i make \ |
-i nano \ |
-i python \ |
- -i grep \ |
-i vim" |
local have_gcc=0 |
- if [[ "${NACL_ARCH}" == "i686" || "${NACL_ARCH}" == "x86_64" ]]; then |
- default_packages+=" \ |
- -i emacs \ |
- -i mingn.base \ |
- -i mingn.lib" |
- have_gcc=1 |
+ if [[ ${TOOLCHAIN} == glibc ]]; then |
+ if [[ ${NACL_ARCH} == i686 || ${NACL_ARCH} == x86_64 ]]; then |
+ default_packages+=" \ |
+ -i binutils \ |
+ -i gcc \ |
+ -i mingn" |
+ have_gcc=1 |
+ fi |
fi |
# Check for updates on some packages. |