OpenJDK / amber / amber
changeset 18032:a1d105cdab46
8014231: --with-alsa configuration options don't add include or lib directories to proper flags
Reviewed-by: tbell
| author | erikj |
|---|---|
| date | Thu, 13 Jun 2013 14:04:54 +0200 |
| parents | 0d804e3b955d |
| children | b537ef8da8d5 |
| files | jdk/makefiles/CompileNativeLibraries.gmk |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/makefiles/CompileNativeLibraries.gmk Wed Jul 05 18:59:08 2017 +0200 +++ b/jdk/makefiles/CompileNativeLibraries.gmk Thu Jun 13 14:04:54 2013 +0200 @@ -2916,7 +2916,7 @@ PLATFORM_API_LinuxOS_ALSA_Ports.c,\ LANG:=C,\ OPTIMIZATION:=LOW, \ - CFLAGS:=$(CFLAGS_JDKLIB) \ + CFLAGS:=$(CFLAGS_JDKLIB) $(ALSA_CFLAGS) \ $(LIBJSOUND_CFLAGS) \ -DUSE_DAUDIO=TRUE \ -DUSE_PORTS=TRUE \ @@ -2925,7 +2925,7 @@ MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \ LDFLAGS:=$(LDFLAGS_JDKLIB)\ $(call SET_SHARED_LIBRARY_ORIGIN),\ - LDFLAGS_SUFFIX:=-lasound -ljava -ljvm,\ + LDFLAGS_SUFFIX:=$(ALSA_LIBS) -ljava -ljvm,\ OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsoundalsa,\ DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES)))