From 8aebf811b766c899d97620874cf39e37b6e4f7a7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 24 Aug 2011 19:52:33 +0200 Subject: honour target cflags/cxxflags, add explizit search paths for headers and library for non-sysroot toolchains --- package/openjdk/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'package/openjdk/Makefile') diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 347f3b01d..4bb68bb88 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -98,7 +98,10 @@ CONFIGURE_ENV+= PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \ + OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ + OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) + ALL_TARGET:= icedtea # add include path for Xrender.h from staging directory @@ -107,6 +110,7 @@ ifeq ($(QEMU),) $(error Fatal error: $$QEMU not set!) endif $(SED) "s#@ADK_TARGETDIR@#$(STAGING_TARGET_DIR)#" ${WRKDIST}/$(PKG_NAME)-$(PKG_VERSION)/jdk/make/sun/xawt/Makefile + $(SED) "s#OTHER_CXXFLAGS#CXXFLAGS_COMMON#" ${WRKDIST}/$(PKG_NAME)-$(PKG_VERSION)/jdk/make/com/sun/java/pack/Makefile do-extract: cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION); \ -- cgit v1.2.3