update dsniff to 2.4b1 and fix some compile issues

[openwrt.git] / openwrt / toolchain / gcc / Config.in

diff --git a/openwrt/toolchain/gcc/Config.in b/openwrt/toolchain/gcc/Config.in
index bec032e..ed39142 100644 (file)
--- a/openwrt/toolchain/gcc/Config.in
+++ b/openwrt/toolchain/gcc/Config.in
@@ -14,7 +14,9 @@ config BR2_GCC_3_4
 
 choice
        prompt "GCC compiler Version" if CONFIG_DEVEL
 
 choice
        prompt "GCC compiler Version" if CONFIG_DEVEL

-       default BR2_GCC_VERSION_3_4_4
+       default BR2_GCC_VERSION_4_0_2 if BR2_LINUX_2_6_ARUBA
+       default BR2_GCC_VERSION_3_4_4 if BR2_LINUX_2_4_BRCM
+       default BR2_GCC_VERSION_3_4_5

        help
          Select the version of gcc you wish to use.
 
        help
          Select the version of gcc you wish to use.
 


@@ -35,8 +37,8 @@ endchoice
 
 config BR2_GCC_VERSION
        string
 
 config BR2_GCC_VERSION
        string

-       default "3.4.4"     if BR2_GCC_VERSION_3_4_4 || !CONFIG_DEVEL
-       default "3.4.5"     if BR2_GCC_VERSION_3_4_5
+       default "3.4.4"     if BR2_GCC_VERSION_3_4_4
+       default "3.4.5"     if BR2_GCC_VERSION_3_4_5 || !CONFIG_DEVEL

        default "4.0.2"     if BR2_GCC_VERSION_4_0_2
 
 
        default "4.0.2"     if BR2_GCC_VERSION_4_0_2