Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-02-03 22:45:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

osxcross-env: remove obsolete LD_LIBRARY_PATH

Browse Source
This commit is contained in:
Thomas Pöchtrager 2015-02-23 21:19:34 +01:00
parent 49bc9aa407
commit 86b2ab7052
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.sh
View File

@ -375,7 +375,6 @@ if [ $HAVE_CSH -eq 1 ]; then
echo "or in case of csh:" echo "or in case of csh:"
echo "" echo ""
echo -e "\x1B[32msetenv PATH \`$OSXCROSS_ENV -v=PATH\`\x1B[0m" echo -e "\x1B[32msetenv PATH \`$OSXCROSS_ENV -v=PATH\`\x1B[0m"
echo -e "\x1B[32msetenv LD_LIBRARY_PATH \`$OSXCROSS_ENV -v=LD_LIBRARY_PATH\`\x1B[0m"
echo "" echo ""
fi fi
echo "to your ~/.bashrc${CSHRC} or ~/.profile (including the '\`')" echo "to your ~/.bashrc${CSHRC} or ~/.profile (including the '\`')"

21
wrapper/programs/osxcross-env.cpp
View File

@ -31,8 +31,6 @@ namespace osxcross {
int env(int argc, char **argv) { int env(int argc, char **argv) {
char epath[PATH_MAX + 1]; char epath[PATH_MAX + 1];
char *oldpath = getenv("PATH"); char *oldpath = getenv("PATH");
char *oldlibpath = getenv("LD_LIBRARY_PATH");
constexpr const char *ltopath = getLibLTOPath();
assert(oldpath); assert(oldpath);
@ -81,9 +79,8 @@ int env(int argc, char **argv) {
std::cerr << std::endl << "you are invoking this program from a C shell, " std::cerr << std::endl << "you are invoking this program from a C shell, "
<< std::endl << "please use " << std::endl << std::endl << std::endl << "please use " << std::endl << std::endl
<< "setenv PATH `" << epath << "/osxcross-env -v=PATH`" << "setenv PATH `" << epath << "/osxcross-env -v=PATH`"
<< std::endl << "setenv LD_LIBRARY_PATH `" << epath << std::endl << std::endl << "instead." << std::endl
<< "/osxcross-env -v=LD_LIBRARY_PATH`" << std::endl << std::endl;
<< std::endl << "instead." << std::endl << std::endl;
} }
} }
@ -126,9 +123,7 @@ int env(int argc, char **argv) {
return ((hasPathSeparator && (check(0) || check(1))) || check(-1)); return ((hasPathSeparator && (check(0) || check(1))) || check(-1));
}; };
if (containsBadChars(oldpath, "PATH") || if (containsBadChars(oldpath, "PATH"))
containsBadChars(oldlibpath, "LD_LIBRARY_PATH") ||
containsBadChars(ltopath, "LIB LTO PATH"))
return 1; return 1;
std::stringstream path; std::stringstream path;
@ -140,17 +135,7 @@ int env(int argc, char **argv) {
if (!hasPath(oldpath, epath, nullptr)) if (!hasPath(oldpath, epath, nullptr))
path << ":" << epath; path << ":" << epath;
if (oldlibpath)
librarypath << oldlibpath;
if (!hasPath(oldlibpath, epath, "/../lib"))
librarypath << ":" << epath << "/../lib";
if (ltopath && !hasPath(oldlibpath, ltopath, nullptr))
librarypath << ":" << ltopath;
vars["PATH"] = path.str(); vars["PATH"] = path.str();
vars["LD_LIBRARY_PATH"] = librarypath.str();
auto printVariable = [&](const std::string & var)->bool { auto printVariable = [&](const std::string & var)->bool {
auto it = vars.find(var); auto it = vars.find(var);