archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8141590: Cannot build Zero with devkit

Browse source 
Reviewed-by: ihse
This commit is contained in:
Erik Joelsson 2016-12-07 16:08:23 +01:00
parent 3592cbe262
commit eaf6a90a9b
7 changed files with 203 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
make/devkit/Tools.gmk
View file

@ -85,8 +85,8 @@ RPM_LIST := \
libgcc \
elfutils elfutils-libs elfutils-devel \
elfutils-libelf elfutils-libelf-devel \
zlib zlib-devel
zlib zlib-devel \
libffi libffi-devel
ifeq ($(ARCH),x86_64)
RPM_DIR ?= $(RPM_DIR_x86_64)
@ -208,6 +208,18 @@ $(libs) : $(rpms)
@mkdir -p $(SYSROOT)/usr/lib
@touch $@
##########################################################################################
# Create links for ffi header files so that they become visible by default when using the
# devkit.
$(SYSROOT)/usr/include/ffi.h: $(rpms)
cd $(@D) && rm $(@F) && ln -s ../lib/libffi-*/include/$(@F) .
$(SYSROOT)/usr/include/ffitarget.h: $(rpms)
cd $(@D) && rm $(@F) && ln -s ../lib/libffi-*/include/$(@F) .
SYSROOT_LINKS += $(SYSROOT)/usr/include/ffi.h $(SYSROOT)/usr/include/ffitarget.h
##########################################################################################
# Define marker files for each source package to be compiled
@ -496,7 +508,7 @@ rpms : $(rpms)
libs : $(libs)
sysroot : rpms libs
gcc : sysroot $(gcc) $(gccpatch)
all : binutils gcc bfdlib $(PREFIX)/devkit.info $(missing-links)
all : binutils gcc bfdlib $(PREFIX)/devkit.info $(missing-links) $(SYSROOT_LINKS)
# this is only built for host. so separate.
ccache : $(ccache)