View | Details | Raw Unified | Return to bug 3
Collapse All | Expand All

(-)a/build.py (-6 / +6 lines)
 Lines 247-252   class Ns3: Link Here 
247
		env.Append (CPPPATH=[cpp_path])
247
		env.Append (CPPPATH=[cpp_path])
248
		header_dir = os.path.join (build_root, 'include', 'ns3')
248
		header_dir = os.path.join (build_root, 'include', 'ns3')
249
		lib_path = os.path.join (build_root, 'lib')
249
		lib_path = os.path.join (build_root, 'lib')
250
		
251
		if env['PLATFORM'] == 'posix':
252
			env.Append( LINKFLAGS = ' -z origin' )
253
			env.Append( RPATH=env.Literal(os.path.join('\\$$ORIGIN', os.pardir, 'lib')) )
254
			
250
		module_builders = []
255
		module_builders = []
251
		for module in self.__modules:
256
		for module in self.__modules:
252
			objects = self.get_obj_builders (variant, module)
257
			objects = self.get_obj_builders (variant, module)
 Lines 254-265   class Ns3: Link Here 
254
259
255
			filename = self.get_mod_output (module, variant)
260
			filename = self.get_mod_output (module, variant)
256
			if module.executable:
261
			if module.executable:
257
				if env['PLATFORM'] == 'posix':
262
				module_builder = env.Program (target = filename, source = objects,
258
					module_builder = env.Program (target = filename, source = objects,
259
								      LIBPATH=lib_path, LIBS=libs, 
260
								      RPATH=lib_path)
261
				else:
262
					module_builder = env.Program (target = filename, source = objects,
263
								      LIBPATH=lib_path, LIBS=libs)
263
								      LIBPATH=lib_path, LIBS=libs)
264
			else:
264
			else:
265
				if variant.static:
265
				if variant.static:

Return to bug 3