From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sat, 4 Jan 2025 08:12:52 +0000 (+0100)
Subject: env-lld-package-metadata
X-Git-Tag: archive/raspbian/1%17.0.6-20+rpi1^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a4c806b58d63ad21804b4f5d81fa9a4d9ed6d165;p=llvm-toolchain-17.git

env-lld-package-metadata


Gbp-Pq: Name env-lld-package-metadata.diff
---

diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index c2059c70e1..71593aa6ee 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -1267,6 +1267,13 @@ static void readConfigs(opt::InputArgList &args) {
   config->orphanHandling = getOrphanHandling(args);
   config->outputFile = args.getLastArgValue(OPT_o);
   config->packageMetadata = args.getLastArgValue(OPT_package_metadata);
+  // No package-metadata option, fall-back to env ELF_PACKAGE_METADATA
+  if (config->packageMetadata.empty()) {
+    const char *env_package_metadata = getenv("ELF_PACKAGE_METADATA");
+    if (env_package_metadata && strcmp(env_package_metadata, "") != 0) {
+      config->packageMetadata = StringRef(env_package_metadata);
+    }
+  }
   config->pie = args.hasFlag(OPT_pie, OPT_no_pie, false);
   config->printIcfSections =
       args.hasFlag(OPT_print_icf_sections, OPT_no_print_icf_sections, false);