summaryrefslogtreecommitdiff
path: root/package/openjdk/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-08-24 19:52:33 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-08-24 19:52:33 +0200
commit8aebf811b766c899d97620874cf39e37b6e4f7a7 (patch)
tree3bab7e2beaee478db6eb573059e6d2fcd009dde5 /package/openjdk/Makefile
parenta32d9bd883df3ed4ee3fabeca3fcc2e3ba768602 (diff)
honour target cflags/cxxflags, add explizit search paths for headers and library for non-sysroot toolchains
Diffstat (limited to 'package/openjdk/Makefile')
-rw-r--r--package/openjdk/Makefile4
1 files changed, 4 insertions, 0 deletions
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); \