From: Soemin Tjong <stjong@microsoft.com>
Date: Thu, 13 Apr 2017 19:23:08 +0000 (-0700)
Subject: [IOT-1986] Windows: Workaround race condition linking with oc_logger.lib
X-Git-Tag: 1.3.0~314
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7daecff61e1f0a432c732c7400f1681066174c75;p=platform%2Fupstream%2Fiotivity.git

[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 <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/18937
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
---

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'])