Mercurial > hg > openjdk > jdk8u > jdk
changeset 7320:42aa9f182885 jdk8-b95
Merge
| author | katleman |
|---|---|
| date | Tue, 18 Jun 2013 15:32:53 -0700 |
| parents | 1f855dd74077 (current diff) 3531945431aa (diff) |
| children | 0c4db4782114 e3d5df92f4ff |
| files | makefiles/CompileNativeLibraries.gmk |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/CompileNativeLibraries.gmk Fri Jun 14 07:26:49 2013 -0700 +++ b/makefiles/CompileNativeLibraries.gmk Tue Jun 18 15:32:53 2013 -0700 @@ -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)))