From c78a3a0b01d934c31f599523bb941d0a6e6ecbc8 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Fri, 30 Jun 2017 16:59:53 +0200
Subject: Add other licenses.

---
 solc/CommandLineInterface.cpp | 1 +
 solc/jsonCompiler.cpp         | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'solc')

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index d0134113..0222ccb0 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -190,6 +190,7 @@ static void version()
 
 static void license()
 {
+	cout << otherLicenses << endl;
 	// This is a static variable generated by cmake from LICENSE.txt
 	cout << licenseText << endl;
 	exit(0);
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp
index adf991d6..de797b3c 100644
--- a/solc/jsonCompiler.cpp
+++ b/solc/jsonCompiler.cpp
@@ -266,8 +266,8 @@ extern "C"
 {
 extern char const* license()
 {
-	/// TOOD: include the copyright information on the top.
-	return licenseText;
+	static string fullLicenseText = otherLicenses + licenseText;
+	return fullLicenseText.c_str();
 }
 extern char const* version()
 {
-- 
cgit