# HG changeset patch
# User katleman
# Date 1371594773 25200
# Node ID b537ef8da8d5d2bcb99dd5c3f0a29fe880978f15
# Parent  5e467681e7810aecdc8fd585588ef47bed91e311# Parent  a1d105cdab46641b16c89ba9c04ccce29974a681
Merge

diff -r 5e467681e781 -r b537ef8da8d5 jdk/makefiles/CompileNativeLibraries.gmk
--- a/jdk/makefiles/CompileNativeLibraries.gmk	Fri Jun 14 07:26:49 2013 -0700
+++ b/jdk/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)))