Revert "Merge pull request #36 from MentorEmbedded/sb-1905"

This reverts commit f901bfd098, reversing
changes made to 69d2f98eda.

cs-license & friends don't obey TMPDIR, so this workaround had no useful
effect for our builds.
This commit is contained in:
Christopher Larson
2014-07-18 16:03:21 -07:00
parent 84cec45ee5
commit 6f37610680

View File

@@ -156,23 +156,17 @@ def populate_toolchain_links(d):
if not files:
bb.fatal("Unable to populate toolchain binary symlinks in %s" % pattern)
origenv = d.getVar('BB_ORIGENV', False)
logname = origenv.get('LOGNAME', 'unknown')
tmpdir = os.path.join(origenv.get('TMPDIR', '/tmp'), 'sourcery-%s' % logname)
bb.utils.mkdirhier(tmpdir)
bindir = d.getVar('STAGING_BINDIR_TOOLCHAIN', True)
bb.utils.mkdirhier(bindir)
for f in files:
base = os.path.basename(f)
newpath = os.path.join(bindir, base)
if not os.path.exists(newpath):
with open(newpath, 'w') as new:
new.write('#!/bin/sh\n')
new.write('export TMPDIR="{0}"\n'.format(tmpdir))
new.write('exec "{0}" "$@"\n'.format(f))
os.fchmod(new.fileno(), 0755)
try:
os.symlink(f, newpath)
except OSError as exc:
if exc.errno == errno.EEXIST:
break
bb.fatal("Unable to populate toolchain binary symlink for %s: %s" % (newpath, exc))
# Ensure that we have a ld.bfd available, now that KERNEL_LD uses it
ld = d.expand('${TARGET_PREFIX}ld')