aboutsummaryrefslogtreecommitdiffstats
path: root/solc
diff options
context:
space:
mode:
Diffstat (limited to 'solc')
-rw-r--r--solc/CommandLineInterface.cpp1
-rw-r--r--solc/jsonCompiler.cpp8
2 files changed, 3 insertions, 6 deletions
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 1d31ea30..de797b3c 100644
--- a/solc/jsonCompiler.cpp
+++ b/solc/jsonCompiler.cpp
@@ -164,10 +164,6 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback
// "srcmapRuntime" = "0:1:2",
// "assembly" = {}
// }
- // },
- // "formal": {
- // "errors": [ "Error 1" ],
- // "why3": "why3 source"
// }
// }
Json::Value output = Json::objectValue;
@@ -270,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()
{