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

8067060: build can still fail with spaces following -L on link lines

Browse Source 
Reviewed-by: smarks, ihse
This commit is contained in:
Erik Joelsson 2015-01-09 16:54:17 +01:00
parent 696242cabe
commit 6d1426d546
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jdk/make/lib/LibCommon.gmk
View File

@ -53,24 +53,21 @@ endif
# Find the default set of src dirs for a native library. # Find the default set of src dirs for a native library.
# Param 1 - module name # Param 1 - module name
# Param 2 - library name # Param 2 - library name
define FindSrcDirsForLib FindSrcDirsForLib = \
$(call uniq, $(wildcard \ $(call uniq, $(wildcard \
$(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \ $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \
$(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \ $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \
$(JDK_TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2))) $(JDK_TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))
endef
################################################################################ ################################################################################
# Find lib dir for module # Find lib dir for module
# Param 1 - module name # Param 1 - module name
ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
define FindLibDirForModule FindLibDirForModule = \
$(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)$(OPENJDK_TARGET_CPU_LIBDIR) $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)$(OPENJDK_TARGET_CPU_LIBDIR)
endef
else else
define FindLibDirForModule FindLibDirForModule = \
$(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1) $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
endef
endif endif
################################################################################ ################################################################################
@ -78,11 +75,10 @@ endif
# Param 1 - module name # Param 1 - module name
# Param 2 - library name # Param 2 - library name
# Param 3 - subdir for library # Param 3 - subdir for library
define FindLib FindLib = \
$(strip \ $(call FindLibDirForModule, \
$(call FindLibDirForModule, $(strip $1))$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(SHARED_LIBRARY_SUFFIX) \ $(strip $1))$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(SHARED_LIBRARY_SUFFIX)
)
endef
################################################################################ ################################################################################
# Define the header include flags needed to compile against it. # Define the header include flags needed to compile against it.