merge of '4ea5971c2dd26e9c357b906128f0e339d80e3d50'

     and 'e651c4fa9a5d1fc6120cc2309e9cba1388cecc52'

1 files changed, 11 insertions, 4 deletions

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 0fa2b7d122..4d60fa729b 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -33,12 +33,19 @@ BBMASK = ""
 # Uncomment this if you want to use a prebuilt toolchain. You will need to
 # provide packages for toolchain and additional libraries yourself. You also
 # have to set PATH in your environment to make sure BitBake finds additional binaries.
-# Note: You will definitely need to say:
-#     ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
-# to build any of two Linux 2.4 Embedix kernels,
+# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
+
+# Uncomment this if you're building for an arch that uses emulated locale 
+# generation under qemu (mainly arm glibc) and have an external gcc 3.x compiler
+# that OE recognises. This will mean the gcc-native build is skipped, speeding 
+# builds up.
+# ASSUME_PROVIDED += "gcc-native3"
+
+# Uncomment this if you are building Linux 2.4 Embedix kernels.
 # i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget
 # to rename the binaries as instructed in the Wiki.
-# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
+# Most users do not need this anymore thankfully!
+# ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
 
 # Select between multiple alternative providers, if more than one is eligible.
 PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie"