summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-04-23 14:51:02 +0200
committerAndras Timar <atimar@suse.com>2013-04-23 14:51:02 +0200
commit70ecdef0740165ee276f6e4ea97410a53214c09f (patch)
treeb07e81dab54df7a4a943dbcf926562202d5b8a00
parent7a78461075ba4dbab803795f2cb1c7b27ca4f612 (diff)
do not install 64-bit MSVCRT on 32-bit Windows
Change-Id: I73a97ecc3021e00071297ed5fa403cf349f0a9fe
-rw-r--r--scp2/source/ooo/vc_redist.scp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index fa7d1c268737..283ba9c6c0d1 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -93,7 +93,7 @@ MergeModule gid_MergeModule_Microsoft_VC100_CRT_x64
Feature = gm_Root;
Name = "Microsoft_VC100_CRT_x64.msm";
RootDir = "TARGETDIR";
- ComponentCondition = "VC_REDIST=1";
+ ComponentCondition = "(VC_REDIST=1) AND VersionNT64";
End
#endif
@@ -104,7 +104,7 @@ MergeModule gid_MergeModule_Microsoft_VC110_CRT_x64
Feature = gm_Root;
Name = "Microsoft_VC110_CRT_x64.msm";
RootDir = "TARGETDIR";
- ComponentCondition = "VC_REDIST=1";
+ ComponentCondition = "(VC_REDIST=1) AND VersionNT64";
End
#endif