Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
ABI: ignore OSVERSION if abi is not set
Baptiste Daroussin committed 1 year ago
commit 4b130036599f69b16e1dd67127cace0e6c3a273a
parent 2bd24d4
1 file changed +4 -3
modified libpkg/pkg_config.c
@@ -1066,10 +1066,11 @@ config_init_abi(struct pkg_abi *abi)
				    pkg_os_to_string(abi->os));
			}
		}
-
	} else if (env_osversion_string != NULL) {
-
		pkg_emit_error("Setting OSVERSION requires setting ABI as well");
-
		return (EPKG_FATAL);
	} else {
+
		if (env_osversion_string != NULL) {
+
			pkg_emit_notice("Setting OSVERSION requires setting ABI as well (ignoring)");
+
			unsetenv("OSVERSION");
+
		}
		if (pkg_abi_from_file(abi) != EPKG_OK) {
			return (false);
		}