stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8005178: build-infra: Dependency on libfdlibm on mac is broken

Browse Source 
Reviewed-by: tbell, ohair
This commit is contained in:
Erik Joelsson 2012-12-20 13:05:21 +01:00
parent 902594c3e6
commit 8c190945b9
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/makefiles/CompileNativeLibraries.gmk
View File

@ -90,14 +90,11 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM,\
ARFLAGS:=$(ARFLAGS),\ ARFLAGS:=$(ARFLAGS),\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm)) OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm))
BUILD_LIBRARIES += $(BUILD_LIBFDLIBM)
else else
#
# On macosx they do partial (incremental) linking of fdlibm # On macosx the old build does partial (incremental) linking of fdlibm instead of
# code it here...rather than add support to NativeCompilation # a plain static library.
# as this is firt time I see it $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC,\
$(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM,\
LIBRARY:=fdlibm,\ LIBRARY:=fdlibm,\
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm,\ OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm,\
SRC:=$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src,\ SRC:=$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src,\
@ -107,11 +104,12 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM,\
LDFLAGS:=-nostdlib -r -arch x86_64,\ LDFLAGS:=-nostdlib -r -arch x86_64,\
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm)) OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm))
$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) : $(BUILD_LIBFDLIBM) BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
$(BUILD_LIBFDLIBM) : $(BUILD_LIBFDLIBM_MAC)
$(CP) -a $< $@ $(CP) -a $< $@
BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
endif endif
BUILD_LIBRARIES += $(BUILD_LIBFDLIBM)
########################################################################################## ##########################################################################################