commit 835a7b773631261b9ea2fb448a4c8a7a8cacfaab
author Shih-wei Liao <sliao@google.com> Fri Aug 06 02:29:11 2010 -0700
committer Shih-wei Liao <sliao@google.com> Fri Aug 06 02:29:11 2010 -0700
tree 112143265e053729d9980d3148fd04b17001f2ee
parent 8e85d661c3543c4361d8947c1d085e97dd1393bd

1. Retire Ying's LOCAL_REQUIRED_MODULE change (I02184368)
2. Integrate Nick's slang_finalize change (Ib4be2a84)
3. Remove the redundant not-internalizing.

Change-Id: Ica104a12dbb14165c57e2618edab82f1c62a69ac

slang_driver.cpp

diff --git a/slang_driver.cpp b/slang_driver.cpp
index 15c8d32..e6903c1 100644
--- a/slang_driver.cpp
+++ b/slang_driver.cpp
@@ -704,8 +704,6 @@
       SLANG_CALL_AND_CHECK( slangSetSourceFromFile(slang, InputFileNames[count].c_str()) );
 
       std::string beforeLink("/tmp/beforeLINK");
-      std::string afterLink("/tmp/afterLINK");
-
       if (NoLink) {
         SLANG_CALL_AND_CHECK( slangSetOutputToFile(slang, OutputFileNames[count].c_str()) );
       } else {
@@ -713,9 +711,6 @@
         beforeLink.append(".bc");
 
         SLANG_CALL_AND_CHECK( slangSetOutputToFile(slang, beforeLink.c_str()) );
-
-        afterLink.append(  InputFileNames[count].substr( lastSlashPos(InputFileNames[count]) )  );
-        afterLink.append(".bc");
       }
 
       SLANG_CALL_AND_CHECK( slangCompile(slang) <= 0 );
@@ -733,19 +728,18 @@
         continue;
       }
 
-      // llvm-link
+      // llvm-rs-link
       pid_t pid;
       if ((pid = fork()) < 0) {
-        cerr << "Failed before llvm-link" << endl;
+        cerr << "Failed before llvm-rs-link" << endl;
         exit(1);
       } else if (pid == 0) {
         std::string cmd(command);
-        replaceLastPartWithFile(cmd, "llvm-link");
+        replaceLastPartWithFile(cmd, "llvm-rs-link");
 
         char* link0 = linkFile();
         char* link1 = linkFile1();
-        //cerr << cmd << " -o " << afterLink.c_str() << " " << beforeLink.c_str() << " " << link0 << " " << link1 << endl;
-        execl(cmd.c_str(), cmd.c_str(), "-o", OutputFileNames[count].c_str()/*afterLink.c_str()*/, beforeLink.c_str(), link0, link1, NULL);
+        execl(cmd.c_str(), cmd.c_str(), "-o", OutputFileNames[count].c_str(), beforeLink.c_str(), link0, link1, NULL);
       }
 
       waitForChild(pid);
@@ -765,7 +759,6 @@
         }
 
         //cerr << cmd << " -std-link-opts " << internalize << " " << afterLink << " -o " << OutputFileNames[count] << endl;
-        //        execl("/bin/cp", "/bin/cp", afterLink.c_str(), OutputFileNames[count].c_str(), NULL);
         execl(cmd.c_str(), cmd.c_str(), "-std-link-opts", internalize.c_str(), afterLink.c_str(), "-o", OutputFileNames[count].c_str(), NULL);
       }