Przeglądaj źródła

BUG: fix solaris problems in install and ar

Bill Hoffman 24 lat temu
rodzic
commit
863ca7d0e2

+ 2 - 2
Source/cmUnixMakefileGenerator.cxx

@@ -1042,7 +1042,7 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout)
 	  for (i = sf.begin(); i != sf.end(); ++i)
 	    {
 	    fout << "\t@ echo \"Installing " << *i << " \"\n"; 
-	    fout << "\t@if [ -e " << *i << " ] ; then \\\n";
+	    fout << "\t@if [ -f " << *i << " ] ; then \\\n";
             // avoid using install-sh to install install-sh
             // does not work on windows.... 
            if(*i == "install-sh")
@@ -1055,7 +1055,7 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout)
               }
 	    fout << *i
 		 << " " << prefix << l->second.GetInstallPath() << "; \\\n";
-	    fout << "\t elif [ -e ${srcdir}/" << *i << " ] ; then \\\n";
+	    fout << "\t elif [ -f ${srcdir}/" << *i << " ] ; then \\\n";
             // avoid using install-sh to install install-sh
             // does not work on windows....
             if(*i == "install-sh")

+ 1 - 1
Templates/configure

@@ -3054,7 +3054,7 @@ case $system in
 	:
    else
       echo "Using $CXX -xar -o for creating .a libraries"
-      CMAKE_AR="$CXX -xar -o"
+      CMAKE_AR="$CXX"
       CMAKE_AR_ARGS="-xar -o"
    fi
 esac

+ 1 - 1
Templates/configure.in

@@ -551,7 +551,7 @@ case $system in
 	:
    else
       echo "Using $CXX -xar -o for creating .a libraries"
-      CMAKE_AR="$CXX -xar -o"
+      CMAKE_AR="$CXX"
       CMAKE_AR_ARGS="-xar -o"
    fi
 esac