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

8225140: Build fails if directory contains 'unix'

Browse Source 
Reviewed-by: tbell
This commit is contained in:
Erik Joelsson 2019-06-03 10:52:18 -07:00
parent 4bc1fdf83c
commit c0def3b731
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/common/JdkNativeCompilation.gmk
View File

@ -122,7 +122,9 @@ define SetupJdkLibraryBody
endif endif
ifneq ($$($1_EXCLUDE_SRC_PATTERNS), ) ifneq ($$($1_EXCLUDE_SRC_PATTERNS), )
$1_EXCLUDE_SRC := $$(call containing, $$($1_EXCLUDE_SRC_PATTERNS), $$($1_SRC)) $1_SRC_WITHOUT_WORKSPACE_ROOT := $$(patsubst $$(WORKSPACE_ROOT)/%, %, $$($1_SRC))
$1_EXCLUDE_SRC := $$(addprefix %, $$(call containing, $$($1_EXCLUDE_SRC_PATTERNS), \
$$($1_SRC_WITHOUT_WORKSPACE_ROOT)))
$1_SRC := $$(filter-out $$($1_EXCLUDE_SRC), $$($1_SRC)) $1_SRC := $$(filter-out $$($1_EXCLUDE_SRC), $$($1_SRC))
endif endif

6
make/lib/Awt2dLibraries.gmk
View File

@ -39,7 +39,7 @@ LIBAWT_DEFAULT_HEADER_DIRS := \
# We must not include java.desktop/unix/native/libmlib_image, which is only # We must not include java.desktop/unix/native/libmlib_image, which is only
# for usage by solaris-sparc in libmlib_image_v. # for usage by solaris-sparc in libmlib_image_v.
BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := unix BUILD_LIBMLIB_EXCLUDE_SRC_PATTERNS := /unix/
BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -DMLIB_NO_LIBSUNMATH
@ -698,7 +698,7 @@ else # not windows
ifeq ($(call isTargetOs, macosx), true) ifeq ($(call isTargetOs, macosx), true)
# libjawt on macosx do not use the unix code # libjawt on macosx do not use the unix code
LIBJAWT_EXCLUDE_SRC_PATTERNS := unix LIBJAWT_EXCLUDE_SRC_PATTERNS := /unix/
endif endif
ifeq ($(call isTargetOs, macosx), true) ifeq ($(call isTargetOs, macosx), true)
@ -788,7 +788,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
ifeq ($(call isTargetOs, macosx), true) ifeq ($(call isTargetOs, macosx), true)
# libsplashscreen on macosx do not use the unix code # libsplashscreen on macosx do not use the unix code
LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := unix LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS := /unix/
endif endif
LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0