From 6f376106809ac1b58d8dca8d718a0d835b86edf1 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 18 Jul 2014 16:03:21 -0700 Subject: [PATCH] Revert "Merge pull request #36 from MentorEmbedded/sb-1905" This reverts commit f901bfd0980267f8a2a8c6c164b8ffbcbe0a1a7d, reversing changes made to 69d2f98edaf42fa48641ef32794faca7636b9132. cs-license & friends don't obey TMPDIR, so this workaround had no useful effect for our builds. --- .../include/tcmode-external-sourcery.inc | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index 9f51654..e761251 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -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')