Index: lldb/trunk/test/plugins/builder_base.py
===================================================================
--- lldb/trunk/test/plugins/builder_base.py
+++ lldb/trunk/test/plugins/builder_base.py
@@ -79,7 +79,13 @@
     if not d:
         return ""
     pattern = '%s="%s"' if "win32" in sys.platform else "%s='%s'"
-    cmdline = " ".join([pattern % (k, v) for k, v in d.items()])
+
+    def setOrAppendVariable(k, v):
+        append_vars = ["CFLAGS_EXTRAS", "LD_EXTRAS"]
+        if k in append_vars and os.environ.has_key(k):
+            v = os.environ[k] + " " + v
+        return pattern % (k, v)
+    cmdline = " ".join([setOrAppendVariable(k, v) for k, v in d.items()])
 
     return cmdline