build: Preserve target_os change

Yocto sets target_os variable to 'linux', we want to keep it.

help_vars.Update(env) from 03f23f37 is introducing a regression.

Bug: https://jira.iotivity.org/browse/IOT-2651
Change-Id: I688a1a613691a5005bb3c019202466b85d725a4c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>

diff --git a/build_common/SConscript b/build_common/SConscript
index 1a87b03..d4900b0 100755 (executable)
--- a/build_common/SConscript
+++ b/build_common/SConscript
@@ -853,5 +853,8 @@ help_vars.AddVariables(
 )
 help_vars.Update(env)
 Help(help_vars.GenerateHelpText(env, sort=cmp))
+# Replicate change that occured after help_var initialisation from env
+if target_os == "yocto":
+    env['TARGET_OS'] = 'linux'
 
 Return('env')