From 1b9147d7db08a94dd00532bc611ac322c8ed3e57 Mon Sep 17 00:00:00 2001 From: Christopher Gilbert Date: Tue, 30 Aug 2016 12:29:37 +0100 Subject: Fixed a bug causing solc to crash on startup due to invalid environment settings for locale --- lllc/main.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lllc/main.cpp') diff --git a/lllc/main.cpp b/lllc/main.cpp index a4c92d67..46416365 100644 --- a/lllc/main.cpp +++ b/lllc/main.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -52,10 +53,20 @@ void version() exit(0); } +void setEnv() { + std::setlocale(LC_ALL, "C"); +#if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__) + if (!std::setlocale(LC_ALL, "")) { + setenv("LC_ALL", "C", 1); + } +#endif +} + enum Mode { Binary, Hex, Assembly, ParseTree, Disassemble }; int main(int argc, char** argv) { + setEnv(); unsigned optimise = 1; string infile; Mode mode = Hex; -- cgit