From 78f81de607eb4dce5cb018bfcf72fc1100d18ac6 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Thu, 17 May 2007 17:34:19 +0100 Subject: [PATCH] Make WAF scripts modify PATH in environment to allow child processes to find the ns-3 DLLs, instead of using --rpath, which doesn't work on win32. This way at least waf check is able to run the unit tests now. --- src/wscript | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/wscript b/src/wscript index 614dccbae..45d10365f 100644 --- a/src/wscript +++ b/src/wscript @@ -1,5 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- +import os +import sys import Params all_modules = [ @@ -37,7 +39,10 @@ def build(bld): if not env['DISABLE_RPATH']: for module in all_modules: node = bld.m_curdirnode.find_dir(module) - env.append_value('RPATH', '-Wl,--rpath=%s' % (node.abspath(env),)) + if sys.platform == 'win32': + os.environ["PATH"] = ';'.join([os.environ["PATH"], node.abspath(env)]) + else: + env.append_value('RPATH', '-Wl,--rpath=%s' % (node.abspath(env),)) bld.add_subdirs(all_modules)