[IOT-1986] Windows: Workaround race condition linking with oc_logger.lib
authorSoemin Tjong <stjong@microsoft.com>
Thu, 13 Apr 2017 19:23:08 +0000 (12:23 -0700)
committerMike Fenelon <mike.fenelon@microsoft.com>
Mon, 17 Apr 2017 18:14:22 +0000 (18:14 +0000)
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>
build_common/windows/SConscript

index 55af23c..172b72f 100644 (file)
@@ -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'])