From 2fedfdea5be13dfeebf0c615e41b2f15c90834ce Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Fri, 6 Apr 2012 16:52:24 -0600
Subject: [PATCH] fix OS X build regression

---
 classpath/java-lang.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/classpath/java-lang.cpp b/classpath/java-lang.cpp
index bc09cd89fe..855e6b5c60 100644
--- a/classpath/java-lang.cpp
+++ b/classpath/java-lang.cpp
@@ -638,6 +638,9 @@ Java_java_lang_System_getProperty(JNIEnv* e, jclass, jstring name,
 namespace {
   const char* environ[] = { 0 };
 }
+#elif defined __APPLE__
+#  include <crt_externs.h>
+#  define environ (*_NSGetEnviron())
 #else
 extern char** environ;
 #endif