summaryrefslogtreecommitdiff
path: root/src/configure.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/configure.cc')
-rw-r--r--src/configure.cc176
1 files changed, 26 insertions, 150 deletions
diff --git a/src/configure.cc b/src/configure.cc
index 8348c19..a81f8ad 100644
--- a/src/configure.cc
+++ b/src/configure.cc
@@ -23,39 +23,15 @@ std::map<std::string, std::string> external_includedir;
std::map<std::string, std::string> external_libdir;
const Configuration default_configuration{};
-#if !defined(_WIN32)
const Configuration& __attribute__((weak)) configuration()
{
return default_configuration;
}
-#else
-//extern const char * pWeakValue;
-//extern const char * pDefaultWeakValue = NULL;
-//
-//#pragma comment(linker, "/alternatename:_pWeakValue=_pDefaultWeakValue")
-const Configuration& defConfiguration()
-{
- return default_configuration;
-}
-#pragma comment(linker, "/alternatename:?configuration@@YAABUConfiguration@@XZ=?defConfiguration@@YAABUConfiguration@@XZ")
-//https://stackoverflow.com/questions/2290587/gcc-style-weak-linking-in-visual-studio
-//https://devblogs.microsoft.com/oldnewthing/20200731-00/?p=104024
-
-//extern "C"
-//{
-//void default_error_log() { /* do nothing */ }
-//}
-//// For expository simplification: assume x86 cdecl
-//#pragma comment(linker, "/alternatename:_error_log=_default_error_log")
-
-
-#endif
namespace ctor
{
std::optional<std::string> includedir;
std::optional<std::string> libdir;
-std::map<std::string, std::string> conf_values;
}
bool hasConfiguration(const std::string& key)
@@ -70,11 +46,6 @@ bool hasConfiguration(const std::string& key)
return true;
}
- if(ctor::conf_values.find(key) != ctor::conf_values.end())
- {
- return true;
- }
-
const auto& c = configuration();
return c.tools.find(key) != c.tools.end();
}
@@ -92,11 +63,6 @@ const std::string& getConfiguration(const std::string& key,
return *ctor::libdir;
}
- if(ctor::conf_values.find(key) != ctor::conf_values.end())
- {
- return ctor::conf_values[key];
- }
-
const auto& c = configuration();
if(hasConfiguration(key))
{
@@ -122,24 +88,11 @@ std::string locate(const std::string& arch, const std::string& app)
{
std::stringstream ss(path_env);
std::string path;
- while (std::getline(ss, path, ';'))
+ while (std::getline(ss, path, ':'))
{
paths.push_back(path);
}
}
- {
- const auto& cfg = configuration();
- auto it = cfg.env.find("ctorPATH");
- if(it != cfg.env.end())
- {
- std::stringstream ss(it->second);
- std::string path;
- while (std::getline(ss, path, ';'))
- {
- paths.push_back(path);
- }
- }
- }
for(const auto& path_str : paths)
{
std::filesystem::path path(path_str);
@@ -174,10 +127,10 @@ class Args
: public std::vector<char*>
{
public:
- Args(const std::string& name, const std::vector<std::string>& args)
+ Args(const std::vector<std::string>& args)
{
resize(args.size() + 1);
- (*this)[0] = strdup(name.data());
+ (*this)[0] = strdup("./ctor");
for(std::size_t i = 0; i < size() - 1; ++i)
{
(*this)[i + 1] = strdup(args[i].data());
@@ -193,32 +146,15 @@ public:
}
};
-std::string esc(const std::string& in)
-{
- std::string out;
- for(auto c : in)
- {
- switch(c)
- {
- case '\\': out += "\\\\"; break;
- case '"': out += "\\\""; break;
- default:
- out += c;
- break;
- }
- }
- return out;
-}
-
// helper constant for the visitor
template<class> inline constexpr bool always_false_v = false;
-int regenerateCache(Settings& settings,
- const std::string& name,
+int regenerateCache(const Settings& default_settings,
const std::vector<std::string>& args,
const std::map<std::string, std::string>& env)
{
- Args vargs(name, args);
+ Settings settings{default_settings};
+ Args vargs(args);
dg::Options opt;
int key{128};
@@ -249,13 +185,6 @@ int regenerateCache(Settings& settings,
return 0;
});
- opt.add("name", required_argument, 'n',
- "Set the output name of the ctor command to override the current one.",
- [&]() {
- settings.name = optarg;
- return 0;
- });
-
opt.add("cc", required_argument, key++,
"Use specified c-compiler instead of gcc.",
[&]() {
@@ -382,19 +311,6 @@ int regenerateCache(Settings& settings,
opt.process(vargs.size(), vargs.data());
- std::filesystem::path settings_file(settings.name);
- std::filesystem::path argv0_file(vargs[0]);
-
- if(settings_file.is_relative())
- {
- settings_file = std::filesystem::current_path() / settings_file;
- }
- if(argv0_file.is_relative())
- {
- argv0_file = std::filesystem::current_path() / argv0_file;
- }
-
-
if(host_arch.empty())
{
host_arch = build_arch;
@@ -460,20 +376,6 @@ int regenerateCache(Settings& settings,
std::string build_ar = locate(build_arch, ar_prog);
std::string build_ld = locate(build_arch, ld_prog);
- // Store current values for execution in this execution context.
- if(!ctor_includedir.empty())
- {
- ctor::conf_values[cfg::ctor_includedir] = ctor_includedir;
- }
- if(!ctor_libdir.empty())
- {
- ctor::conf_values[cfg::ctor_libdir] = ctor_libdir;
- }
- ctor::conf_values[cfg::host_cxx] = host_cxx;
- ctor::conf_values[cfg::build_cxx] = build_cxx;
- ctor::conf_values[cfg::host_ld] = host_ld;
- ctor::conf_values[cfg::build_ld] = build_ld;
-
std::cout << "Writing results to: " << configurationFile.string() << "\n";
{
std::ofstream istr(configurationFile);
@@ -485,34 +387,34 @@ int regenerateCache(Settings& settings,
istr << " .args = {";
for(const auto& arg : args)
{
- istr << "\"" << esc(arg) << "\",";
+ istr << "\"" << arg << "\",";
}
istr << "},\n";
- istr << " .env = {\n";
+ istr << " .env = {";
for(const auto& e : env)
{
- istr << " {\"" << e.first << "\", \"" << esc(e.second) << "\"},\n";
+ istr << "{\"" << e.first << "\", \"" << e.second << "\"}, ";
}
- istr << " },\n";
+ istr << "},\n";
istr << " .tools = {\n";
- istr << " { \"" << cfg::builddir << "\", \"" << esc(settings.builddir) << "\" },\n";
- istr << " { \"" << cfg::host_cc << "\", \"" << esc(host_cc) << "\" },\n";
- istr << " { \"" << cfg::host_cxx << "\", \"" << esc(host_cxx) << "\" },\n";
- istr << " { \"" << cfg::host_ar << "\", \"" << esc(host_ar) << "\" },\n";
- istr << " { \"" << cfg::host_ld << "\", \"" << esc(host_ld) << "\" },\n";
- istr << " { \"" << cfg::build_cc << "\", \"" << esc(build_cc) << "\" },\n";
- istr << " { \"" << cfg::build_cxx << "\", \"" << esc(build_cxx) << "\" },\n";
- istr << " { \"" << cfg::build_ar << "\", \"" << esc(build_ar) << "\" },\n";
- istr << " { \"" << cfg::build_ld << "\", \"" << esc(build_ld) << "\" },\n";
+ istr << " { \"" << cfg::builddir << "\", \"" << settings.builddir << "\" },\n";
+ istr << " { \"" << cfg::host_cc << "\", \"" << host_cc << "\" },\n";
+ istr << " { \"" << cfg::host_cxx << "\", \"" << host_cxx << "\" },\n";
+ istr << " { \"" << cfg::host_ar << "\", \"" << host_ar << "\" },\n";
+ istr << " { \"" << cfg::host_ld << "\", \"" << host_ld << "\" },\n";
+ istr << " { \"" << cfg::build_cc << "\", \"" << build_cc << "\" },\n";
+ istr << " { \"" << cfg::build_cxx << "\", \"" << build_cxx << "\" },\n";
+ istr << " { \"" << cfg::build_ar << "\", \"" << build_ar << "\" },\n";
+ istr << " { \"" << cfg::build_ld << "\", \"" << build_ld << "\" },\n";
if(!ctor_includedir.empty())
{
- istr << " { \"" << cfg::ctor_includedir << "\", \"" << esc(ctor_includedir) << "\" },\n";
+ istr << " { \"" << cfg::ctor_includedir << "\", \"" << ctor_includedir << "\" },\n";
ctor::includedir = ctor_includedir;
}
if(!ctor_libdir.empty())
{
- istr << " { \"" << cfg::ctor_libdir << "\", \"" << esc(ctor_libdir) << "\" },\n";
+ istr << " { \"" << cfg::ctor_libdir << "\", \"" << ctor_libdir << "\" },\n";
ctor::libdir = ctor_libdir;
}
@@ -606,7 +508,7 @@ int configure(const Settings& global_settings, int argc, char* argv[])
args.push_back(argv[i]);
}
- auto env = configuration().env;
+ std::map<std::string, std::string> env;
auto cc_env = getenv("CC");
if(cc_env)
{
@@ -631,32 +533,7 @@ int configure(const Settings& global_settings, int argc, char* argv[])
env["LD"] = ld_env;
}
- // Env vars for msvc
- auto cl_env = getenv("CL");
- if(cl_env)
- {
- env["CL"] = cl_env;
- }
-
- auto lib_env = getenv("LIB");
- if(lib_env)
- {
- env["LIB"] = lib_env;
- }
-
- auto link_env = getenv("LINK");
- if(link_env)
- {
- env["LINK"] = link_env;
- }
-
- auto path_env = getenv("PATH");
- if(path_env)
- {
- env["ctorPATH"] = path_env;
- }
-
- auto ret = regenerateCache(settings, argv[0], args, env);
+ auto ret = regenerateCache(settings, args, env);
if(ret != 0)
{
return ret;
@@ -667,9 +544,8 @@ int configure(const Settings& global_settings, int argc, char* argv[])
return 0;
}
-int reconfigure(const Settings& global_settings, int argc, char* argv[])
+int reconfigure(const Settings& settings, int argc, char* argv[])
{
- Settings settings{global_settings};
bool no_rerun{false};
std::vector<std::string> args;
@@ -697,7 +573,7 @@ int reconfigure(const Settings& global_settings, int argc, char* argv[])
}
std::cout << "\n";
- auto ret = regenerateCache(settings, argv[0], cfg.args, cfg.env);
+ auto ret = regenerateCache(settings, cfg.args, cfg.env);
if(ret != 0)
{
return ret;
@@ -710,5 +586,5 @@ int reconfigure(const Settings& global_settings, int argc, char* argv[])
return 0; // this was originally invoked by configure, don't loop
}
- return execute(argv[0], args, {});
+ return execute(argv[0], args);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 03:15:07 +0000