Bugzilla Bug 316369: support building JSS on Mac OS X. The patch is

contributed by Nathin Kinder <nkinder@redhat.com>. r=wtc.
Modified files: coreconf/jdk.mk jss/lib/config.mk

security/coreconf/jdk.mk

@@ -184,6 +184,31 @@ ifeq ($(OS_ARCH), Linux)
 	JDK_JIT_OPT =
 endif
 
+# set [Mac OS X] platforms
+ifeq ($(OS_ARCH), Darwin)
+	JAVA_CLASSES = $(JAVA_HOME)/../Classes/classes.jar
+
+	ifeq ($(JRE_HOME),)
+		JRE_HOME = $(JAVA_HOME)
+		JRE_CLASSES = $(JAVA_CLASSES)
+	else
+		ifeq ($(JRE_CLASSES),)
+			JRE_CLASSES = $(JRE_HOME)/../Classes/classes.jar
+		endif
+	endif
+
+	PATH_SEPARATOR = :
+
+	# (2) specify "header" information
+	JAVA_ARCH = darwin
+
+	INCLUDES += -I$(JAVA_HOME)/include
+	INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
+
+	# no JIT option available on this platform
+	JDK_JIT_OPT =
+endif
+
 # set [IBM AIX] platforms
 ifeq ($(OS_ARCH), AIX)
 	JAVA_CLASSES = $(JAVA_HOME)/jre/lib/rt.jar

security/jss/lib/config.mk

@@ -71,6 +71,12 @@ EXTRA_SHARED_LIBS += \
 
 else
 
+# Darwin needs to use the dylib_file linker option for nss to
+# find its dependencies (libsoftokn3.dylib).
+ifeq ($(OS_ARCH),Darwin)
+	EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
+endif
+
 EXTRA_SHARED_LIBS += \
     -L$(NSS_LIB_DIR) \
     -lnss3 \