From 7daecff61e1f0a432c732c7400f1681066174c75 Mon Sep 17 00:00:00 2001 From: Soemin Tjong Date: Thu, 13 Apr 2017 12:23:08 -0700 Subject: [PATCH] [IOT-1986] Windows: Workaround race condition linking with oc_logger.lib Temporary solution for similar issue as described in: https://gerrit.iotivity.org/gerrit/#/c/18767/ Change-Id: Ib02c0e77b3700aed89111ce95e131db121e7acdd Signed-off-by: Soemin Tjong Reviewed-on: https://gerrit.iotivity.org/gerrit/18937 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai Reviewed-by: Uze Choi Reviewed-by: Mike Fenelon --- build_common/windows/SConscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build_common/windows/SConscript b/build_common/windows/SConscript index 55af23c..172b72f 100644 --- a/build_common/windows/SConscript +++ b/build_common/windows/SConscript @@ -48,7 +48,10 @@ if env['CC'] == 'cl': # Work around this issue by linking with the source of InstallTarget(), rather # than the target. env.PrependUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource', 'src')]) - + + # Similar link issue described above [IOT-1986] is also observed when linking oc_logger.lib. + env.PrependUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource', 'oc_logger')]) + env.AppendUnique(PATH = os.environ['PATH']) env['PDB'] = '${TARGET.base}.pdb' env.Append(LINKFLAGS=['/PDB:${TARGET.base}.pdb']) -- 2.7.4