diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2025-02-06 17:23:10 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2025-02-06 17:23:10 +0100 |
| commit | f3fedaf53ed90cb5f1eda704c6f199a8b34ecc96 (patch) | |
| tree | 2df56df6ced59dd45217fb732bfe11b7b4e0f742 | |
| parent | 794335cf16b3c522b09b10dc5fb02c9554084f8a (diff) | |
Remove strip argument, since it doesn't make sense on all platforms.
| -rw-r--r-- | src/ctor.h | 1 | ||||
| -rw-r--r-- | src/rebuild.cc | 1 | ||||
| -rw-r--r-- | src/tools.cc | 3 | ||||
| -rw-r--r-- | test/tools_test.cc | 14 |
4 files changed, 1 insertions, 18 deletions
@@ -130,7 +130,6 @@ enum class ld_opt { // gcc/clang output, // -o - strip, // -s warn_all, // -Wall warnings_as_errors, // -Werror library_path, // -L<arg> diff --git a/src/rebuild.cc b/src/rebuild.cc index 52245fe..a2b7ddd 100644 --- a/src/rebuild.cc +++ b/src/rebuild.cc @@ -181,7 +181,6 @@ bool recompileCheck(const ctor::settings& global_settings, int argc, char* argv[ c.get(ctor::cfg::ctor_libdir)); } config.flags.ldflags.emplace_back(ctor::ld_opt::link, "ctor"); - config.flags.ldflags.emplace_back(ctor::ld_opt::strip); config.flags.ldflags.emplace_back(ctor::ld_opt::threads); ctor::settings settings{global_settings}; diff --git a/src/tools.cc b/src/tools.cc index 8c9b7e2..f6cb437 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -71,7 +71,6 @@ std::ostream& operator<<(std::ostream& stream, const ctor::ld_opt& opt) switch(opt) { case ctor::ld_opt::output: stream << "ctor::ld_opt::output"; break; - case ctor::ld_opt::strip: stream << "ctor::ld_opt::strip"; break; case ctor::ld_opt::warn_all: stream << "ctor::ld_opt::warn_all"; break; case ctor::ld_opt::warnings_as_errors: stream << "ctor::ld_opt::warnings_as_errors"; break; case ctor::ld_opt::library_path: stream << "ctor::ld_opt::library_path"; break; @@ -503,8 +502,6 @@ std::vector<std::string> ld_option(ctor::ld_opt opt, const std::string& arg, { case ctor::ld_opt::output: return {"-o", arg}; - case ctor::ld_opt::strip: - return {"-s"}; case ctor::ld_opt::warn_all: return {"-Wall"}; case ctor::ld_opt::warnings_as_errors: diff --git a/test/tools_test.cc b/test/tools_test.cc index 46ab084..5ae04c3 100644 --- a/test/tools_test.cc +++ b/test/tools_test.cc @@ -520,10 +520,6 @@ public: act = ld_option(ctor::toolchain::gcc, ctor::ld_opt::output, "foo"); uASSERT_EQUAL(exp, act); - exp = { "-s" }; - act = ld_option(ctor::toolchain::gcc, ctor::ld_opt::strip); - uASSERT_EQUAL(exp, act); - exp = { "-Wall" }; act = ld_option(ctor::toolchain::gcc, ctor::ld_opt::warn_all); uASSERT_EQUAL(exp, act); @@ -571,10 +567,6 @@ public: act = ld_option(ctor::toolchain::clang, ctor::ld_opt::output, "foo"); uASSERT_EQUAL(exp, act); - exp = { "-s" }; - act = ld_option(ctor::toolchain::clang, ctor::ld_opt::strip); - uASSERT_EQUAL(exp, act); - exp = { "-Wall" }; act = ld_option(ctor::toolchain::clang, ctor::ld_opt::warn_all); uASSERT_EQUAL(exp, act); @@ -622,10 +614,6 @@ public: act = ld_option(ctor::toolchain::any, ctor::ld_opt::output, "foo"); uASSERT_EQUAL(exp, act); - exp = { "{ctor::ld_opt::strip}" }; - act = ld_option(ctor::toolchain::any, ctor::ld_opt::strip); - uASSERT_EQUAL(exp, act); - exp = { "{ctor::ld_opt::warn_all}" }; act = ld_option(ctor::toolchain::any, ctor::ld_opt::warn_all); uASSERT_EQUAL(exp, act); @@ -908,7 +896,7 @@ public: // Mismatching toolchain (required vs actual) results in no output // otherwise to_strings is just a proxy for ld_option - act = to_strings(ctor::toolchain::gcc, {ctor::toolchain::clang, ctor::ld_opt::strip}); + act = to_strings(ctor::toolchain::gcc, {ctor::toolchain::clang, ctor::ld_opt::threads}); uASSERT_EQUAL(exp, act); } |