Don't try to rename the compiler output of an OPARI modified source file if it's specified by '-o'

This commit was SVN r24601.

ompi/contrib/vt/vt/ChangeLog

@@ -1,6 +1,9 @@
 5.8.4openmpi
 	- fixed handling NULL value of pathname given to certain I/O calls
 	  (e.g. fopen, open, unlink)
+	- fixed a bug in the compiler wrappers: don't try to rename the
+	  compiler output of an OPARI modified source file if it's
+	  specified by '-o'
 
 5.8.3openmpi
 	- fixed compile error on Red Hat 5.x which occurred if using GNU

ompi/contrib/vt/vt/tools/vtwrapper/vt_wrapper.cc

@@ -752,6 +752,14 @@ Wrapper::parseCommandLine( int argc, char ** argv )
 	 m_pConfig->compiler_addArg( arg );
       }
       //
+      // -o
+      //
+      else if( arg.compare( "-o" ) == 0 )
+      {
+         m_pConfig->m_bOutfileGiven = true;
+         m_pConfig->compiler_addArg( arg );
+      }
+      //
       // -l<mpilib>
       //
       else if( arg.compare( 0, 5, "-lmpi" ) == 0
@@ -981,7 +989,7 @@ Wrapper::run()
                std::cout << "+++ rename " << m_pConfig->m_vecOpari_ModObjFiles[i]
                          << " to " << target << std::endl;
 
-            if( m_pConfig->m_bCompOnly &&
+            if( m_pConfig->m_bCompOnly && !m_pConfig->m_bOutfileGiven &&
                 rename( m_pConfig->m_vecOpari_ModObjFiles[i].c_str(),
                         target.c_str() ) == -1 )
             {
@@ -1249,7 +1257,7 @@ Wrapper::getIncFilesFromTabFile()
 Config::Config() :
    m_eLangType(LANG_CC), m_eInstType(INST_TYPE_MANUAL), m_iInstAvail(0),
 
-   m_bBeVerbose(false), m_bCompOnly(false),
+   m_bBeVerbose(false), m_bCompOnly(false), m_bOutfileGiven(false),
    m_bUsesMpi(false), m_bUsesThreads(false),
    m_bUsesOpenMP(false), m_bKeepOpariRcFile(false),
    m_bShow(false)

ompi/contrib/vt/vt/tools/vtwrapper/vt_wrapper.h

@@ -157,6 +157,7 @@ protected:
    int         m_iInstAvail;            // bitmask for available instr.-types
    bool        m_bBeVerbose;            // FLAG: be verbose ?
    bool        m_bCompOnly;             // FLAG: compile only ?
+   bool        m_bOutfileGiven;         // FLAG: output file given ?
    bool        m_bUsesMpi;              // FLAG: uses MPI ?
    bool        m_bUsesThreads;          // FLAG: uses Threads ?
    bool        m_bUsesOpenMP;           // FLAG: uses OpenMP ? (use OPARI)