From 38d2c01bff3a2e44068fc209e94f5b35acbdfdc8 Mon Sep 17 00:00:00 2001
From: "Gustavo J. A. M. Carneiro" <gjc@inescporto.pt>
Date: Sat, 20 Nov 2010 17:55:53 +0000
Subject: [PATCH] Bug 1032 - Unable to specify multiple Compiler/Linker flags

---
 wscript | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wscript b/wscript
index 3023c0152..5d8eb60bc 100644
--- a/wscript
+++ b/wscript
@@ -7,6 +7,7 @@ import types
 import optparse
 import os.path
 import re
+import shlex
 
 # WAF modules
 import pproc as subprocess
@@ -385,7 +386,8 @@ def configure(conf):
                               ['LINKFLAGS', 'LINKFLAGS_EXTRA'],
                               ['LINKFLAGS', 'LDFLAGS_EXTRA']]:
         if envvar in os.environ:
-            conf.env.append_value(confvar, os.environ[envvar])
+            value = shlex.split(os.environ[envvar])
+            conf.env.append_value(confvar, value)
 
     # Write a summary of optional features status
     print "---- Summary of optional NS-3 features:"