Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.6/120-java-nomulti.patch
author Cody Schafer <dev@codyps.com>
Fri May 09 19:13:49 2014 -0700 (2014-05-09)
changeset 3312 4876ff97e039
parent 2149 98b7806295cc
permissions -rw-r--r--
cc/gcc: allow CC_EXTRA_CONFIG_ARRAY on baremetal

The final bare-metal compiler is built using the core backend.
Currently the core uses the CC_CORE_EXTRA_CONFIG_ARRAY variable.

While this works as supposed to, this can leave the user puzzled
in the menuconfig, since all he can see is the core options, not
the final options.

Only show the core options if any of the core passes are needed,
and use the final options in the core-backend if we're issuing
the bare-metal compiler.

Signed-off-by: Cody P Schafer <dev@codyps.com>
[yann.morin.1998@free.fr: hide core options if no core pass needed;
use final option in core backend if issuing the bare-metal compiler]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <22181e546ba746202489.1399688067@localhost>
Patchwork-Id: 347586 
     1 diff -durN gcc-4.4.5.orig/libjava/configure gcc-4.4.5/libjava/configure

     2 --- gcc-4.4.5.orig/libjava/configure	2010-10-01 10:26:18.000000000 +0200

     3 +++ gcc-4.4.5/libjava/configure	2010-10-09 22:58:04.000000000 +0200

     4 @@ -1022,6 +1022,8 @@

     5                            default=yes

     6    --enable-java-maintainer-mode

     7                            allow rebuilding of .class and .h files

     8 +  --enable-libjava-multilib

     9 +                          build libjava as multilib

    10    --disable-dependency-tracking  speeds up one-time build

    11    --enable-dependency-tracking   do not reject slow dependency extractors

    12    --enable-maintainer-mode  enable make rules and dependencies not useful

    13 @@ -1974,6 +1976,16 @@

    14  fi

    15  

    16  

    17 +# Check whether --enable-libjava-multilib was given.

    18 +if test "${enable_libjava_multilib+set}" = set; then

    19 +  enableval=$enable_libjava_multilib;

    20 +fi

    21 +

    22 +if test "$enable_libjava_multilib" = no; then

    23 +  multilib=no

    24 +  ac_configure_args="$ac_configure_args --disable-multilib"

    25 +fi

    26 +

    27  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.

    28  

    29  

    30 diff -durN gcc-4.4.5.orig/libjava/configure.ac gcc-4.4.5/libjava/configure.ac

    31 --- gcc-4.4.5.orig/libjava/configure.ac	2010-06-11 13:49:16.000000000 +0200

    32 +++ gcc-4.4.5/libjava/configure.ac	2010-10-09 22:58:04.000000000 +0200

    33 @@ -139,6 +139,13 @@

    34  	[allow rebuilding of .class and .h files]))

    35  AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)

    36  

    37 +AC_ARG_ENABLE(libjava-multilib,

    38 +	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))

    39 +if test "$enable_libjava_multilib" = no; then

    40 +  multilib=no

    41 +  ac_configure_args="$ac_configure_args --disable-multilib"

    42 +fi

    43 +

    44  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.

    45  GCC_NO_EXECUTABLES

    46
crosstool-ng