diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-01-12 22:08:56 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-01-12 22:08:56 +0100 |
| commit | b0bcafc6a0e03e5ee7506a051ebbb0b93c94941b (patch) | |
| tree | 740f98882416e31aa7f94da2d1a0f4f41a3af66c /toolchain | |
| parent | 74b46041e4622a00e9d7392986c974eb6c455d61 (diff) | |
Remove java support
Has been marked as broken since July 2010 (39e6ba1b), and nobody has
stepped up to support it, so now finally remove it completely.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/Config.in | 12 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 19 |
2 files changed, 0 insertions, 31 deletions
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index dbcbbd3fd..acaa3a88d 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -68,18 +68,6 @@ config BR2_EXTRA_GCC_CONFIG_OPTIONS help Any additional gcc configure options you may want to include.... -config BR2_GCC_CROSS_JAVA - bool - -config BR2_INSTALL_LIBGCJ - bool "Build/install java compiler and libgcj?" - depends on !BR2_avr32 && BR2_INSTALL_LIBSTDCPP - select BR2_GCC_CROSS_JAVA - select BR2_LARGEFILE - depends on BROKEN - help - Build/install java compiler and libgcj? - config BR2_INSTALL_OBJC bool "Build/install Objective-C compiler and runtime?" depends on !BR2_avr32 diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index a2253c9fa..3074799d9 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -75,15 +75,11 @@ endif ifeq ($(BR2_GCC_CROSS_FORTRAN),y) GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),fortran endif -ifeq ($(BR2_GCC_CROSS_JAVA),y) -GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),java -endif ifeq ($(BR2_GCC_CROSS_OBJC),y) GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),objc endif GCC_COMMON_PREREQ=$(wildcard $(BR2_DEPENDS_DIR)/br2/install/libstdcpp*)\ -$(wildcard $(BR2_DEPENDS_DIR)/br2/install/libgcj*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/install/objc*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/install/fortran*)\ $(wildcard $(BR2_DEPENDS_DIR)/br2/prefer/ima*)\ @@ -100,10 +96,6 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y) GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),c++ endif -ifeq ($(BR2_INSTALL_LIBGCJ),y) -GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),java -endif - ifeq ($(BR2_INSTALL_OBJC),y) GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),objc endif @@ -466,17 +458,6 @@ ifeq ($(BR2_GCC_SHARED_LIBGCC),y) -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libstdc++.so* endif endif -ifeq ($(BR2_INSTALL_LIBGCJ),y) - cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcj.so* $(STAGING_DIR)/usr/lib/ - cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgcj.so* $(TARGET_DIR)/usr/lib/ - mkdir -p $(STAGING_DIR)/usr/lib/security - mkdir -p $(TARGET_DIR)/usr/lib/security - cp -dpf $(HOST_DIR)/usr/lib/security/classpath.security \ - $(STAGING_DIR)/usr/lib/security/ - cp -dpf $(HOST_DIR)/usr/lib/security/classpath.security \ - $(TARGET_DIR)/usr/lib/security/ - -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libgcj.so* -endif ifeq ($(BR2_GCC_ENABLE_OPENMP),y) cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgomp.so* $(STAGING_DIR)/usr/lib/ cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libgomp.so* $(TARGET_DIR)/usr/lib/ |