toolchain/gcc: fix java support
Not runtime tested, but now it atleast builds.
This commit is contained in:
parent
1f3eec6e8f
commit
a62ceefdd4
|
@ -142,9 +142,13 @@ config BR2_GCC_CROSS_FORTRAN
|
||||||
help
|
help
|
||||||
Build a Fortran cross-compiler
|
Build a Fortran cross-compiler
|
||||||
|
|
||||||
|
config BR2_GCC_CROSS_JAVA
|
||||||
|
bool
|
||||||
|
|
||||||
config BR2_INSTALL_LIBGCJ
|
config BR2_INSTALL_LIBGCJ
|
||||||
bool "Build/install java compiler and libgcj?"
|
bool "Build/install java compiler and libgcj?"
|
||||||
depends on !BR2_avr32 && BR2_INSTALL_LIBSTDCPP
|
depends on !BR2_avr32 && BR2_INSTALL_LIBSTDCPP
|
||||||
|
select BR2_GCC_CROSS_JAVA
|
||||||
help
|
help
|
||||||
Build/install java compiler and libgcj?
|
Build/install java compiler and libgcj?
|
||||||
|
|
||||||
|
|
|
@ -80,6 +80,9 @@ endif
|
||||||
ifeq ($(BR2_GCC_CROSS_FORTRAN),y)
|
ifeq ($(BR2_GCC_CROSS_FORTRAN),y)
|
||||||
GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),fortran
|
GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),fortran
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(BR2_GCC_CROSS_JAVA),y)
|
||||||
|
GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),java
|
||||||
|
endif
|
||||||
ifeq ($(BR2_GCC_CROSS_OBJC),y)
|
ifeq ($(BR2_GCC_CROSS_OBJC),y)
|
||||||
GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),objc
|
GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),objc
|
||||||
endif
|
endif
|
||||||
|
@ -356,14 +359,11 @@ ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(BR2_INSTALL_LIBGCJ),y)
|
ifeq ($(BR2_INSTALL_LIBGCJ),y)
|
||||||
cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/lib/
|
cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcj.so* $(TARGET_DIR)/usr/lib/
|
||||||
cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/lib/
|
|
||||||
cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/lib/
|
|
||||||
mkdir -p $(TARGET_DIR)/usr/lib/security
|
mkdir -p $(TARGET_DIR)/usr/lib/security
|
||||||
cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security \
|
|
||||||
$(TARGET_DIR)/usr/lib/security/
|
|
||||||
cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security \
|
cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security \
|
||||||
$(TARGET_DIR)/usr/lib/security/
|
$(TARGET_DIR)/usr/lib/security/
|
||||||
|
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libgcj.so*
|
||||||
endif
|
endif
|
||||||
mkdir -p $(@D)
|
mkdir -p $(@D)
|
||||||
touch $@
|
touch $@
|
||||||
|
|
Loading…
Reference in New Issue