From 9f901c8ef1d5cbf100ebdf79e3619b3aa8c8d234 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 10 Sep 2008 13:11:35 +0200 Subject: [PATCH] nsc: fix liblinux2.6.18.so sym link creation changeset 3628:a9c05c7e54f2 ('Move all NSC related build code into src/internet-stack') erronoulsy moved the sym link creation outside of the loop. closes bug #328. --- src/internet-stack/wscript | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/internet-stack/wscript b/src/internet-stack/wscript index 517444bca..7843da9eb 100644 --- a/src/internet-stack/wscript +++ b/src/internet-stack/wscript @@ -101,6 +101,7 @@ class NscBuildTask(Task.TaskBase): def run(self): # XXX: Detect gcc major version(s) available to build supported stacks + builddir = self.builddir kernels = [['linux-2.6.18', 'linux2.6.18'], ['linux-2.6.26', 'linux2.6.26']] for dir, name in kernels: @@ -108,14 +109,13 @@ class NscBuildTask(Task.TaskBase): if not os.path.exists(os.path.join("..", NSC_DIR, dir, soname)): if os.system('cd ../%s && python scons.py %s' % (NSC_DIR, dir)) != 0: Params.fatal("Building NSC stack failed") - builddir = self.builddir - if not os.path.exists(builddir + '/' + soname): - try: - os.symlink('../../' + NSC_DIR + '/' + dir + '/' + soname, builddir + '/' + soname) - except: - Params.fatal("Error linking " + builddir + '/' + soname) - + if not os.path.exists(builddir + '/' + soname): + try: + os.symlink('../../' + NSC_DIR + '/' + dir + '/' + soname, builddir + '/' + soname) + except: + Params.fatal("Error linking " + builddir + '/' + soname) + def build(bld): obj = bld.create_ns3_module('internet-stack', ['node'])