From 39d9efb7724bed98518825db2e2cba79f0f2f0f1 Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@google.com>
Date: Thu, 9 Jul 2015 20:22:39 +0000
Subject: COFF: Fix command line options for external commands.

llvm-svn: 241853
---
 lld/COFF/DriverUtils.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lld/COFF')

diff --git a/lld/COFF/DriverUtils.cpp b/lld/COFF/DriverUtils.cpp
index 3863befd9c29..cb838424e7d9 100644
--- a/lld/COFF/DriverUtils.cpp
+++ b/lld/COFF/DriverUtils.cpp
@@ -488,7 +488,7 @@ convertResToCOFF(const std::vector<MemoryBufferRef> &MBs) {
 
   // Execute cvtres.exe.
   Executor E("cvtres.exe");
-  E.add("/machine:x64");
+  E.add("/machine:" + machineTypeToStr(Config->MachineType));
   E.add("/readonly");
   E.add("/nologo");
   E.add("/out:" + Path);
@@ -541,7 +541,7 @@ std::error_code writeImportLibrary() {
 
   Executor E("lib.exe");
   E.add("/nologo");
-  E.add("/machine:x64");
+  E.add("/machine:" + machineTypeToStr(Config->MachineType));
   E.add(Twine("/def:") + Def);
   if (Config->Implib.empty()) {
     SmallString<128> Out = StringRef(Config->OutputFile);
-- 
cgit v1.2.3