Author: dgilmore
Date: 2010-09-21 18:25:43 -0400 (Tue, 21 Sep 2010)
New Revision: 3353

Modified:
   trunk/install_compiler.sh
Log:
Fix problem exposed by r3284, libhugetlbfs 64 bit linker scripts
should be installed the new 64 bit library directory.

Also included is a cleanup change that removes an error message
that is innocuously generated when the install script is run more
than once.

Reviewed by Mei.


Modified: trunk/install_compiler.sh
===================================================================
--- trunk/install_compiler.sh   2010-09-21 14:39:55 UTC (rev 3352)
+++ trunk/install_compiler.sh   2010-09-21 22:25:43 UTC (rev 3353)
@@ -206,7 +206,7 @@
 
     # Make links to gcc runtime libraries
     cd ${ROOT}
-    mkdir $PHASEPATH/64
+    test -d $PHASEPATH/64 || mkdir $PHASEPATH/64
     if [ "$TARG_HOST" = "x8664" ]
     then
        for i in open64-gcc-4.2.0/lib64/lib*.so*; do
@@ -365,19 +365,19 @@
         (cd ${PHASEPATH}; ln -sf libhugetlbfs_open64.so.1 
libhugetlbfs_open64.so)
         (cd ${PHASEPATH}/32; ln -sf libhugetlbfs_open64.so.1 
libhugetlbfs_open64.so)
 
-        INSTALL_DATA_SUB ${HUGETLB}/ldscripts/elf_x86_64.xB      
${PHASEPATH}/elf.xB
+        INSTALL_DATA_SUB ${HUGETLB}/ldscripts/elf_x86_64.xB      
${PHASEPATH}/64/elf.xB
         INSTALL_DATA_SUB ${HUGETLB}/ldscripts/elf_i386.xB        
${PHASEPATH}/32/elf.xB
 
-        INSTALL_DATA_SUB ${HUGETLB}/ldscripts/elf_x86_64.xBDT    
${PHASEPATH}/elf.xBDT
+        INSTALL_DATA_SUB ${HUGETLB}/ldscripts/elf_x86_64.xBDT    
${PHASEPATH}/64/elf.xBDT
         INSTALL_DATA_SUB ${HUGETLB}/ldscripts/elf_i386.xBDT      
${PHASEPATH}/32/elf.xBDT
 
-        INSTALL_DATA_SUB ${HUGETLB}/ldscripts/elf_x86_64_1G.xBDT    
${PHASEPATH}/elf_1G.xBDT
+        INSTALL_DATA_SUB ${HUGETLB}/ldscripts/elf_x86_64_1G.xBDT    
${PHASEPATH}/64/elf_1G.xBDT
         INSTALL_DATA_SUB ${HUGETLB}/ldscripts/elf_i386_1G.xBDT      
${PHASEPATH}/32/elf_1G.xBDT
 
-        INSTALL_DATA_SUB ${LIBAREA}/libhugetlbfs/elf.xBD    
${PHASEPATH}/elf.xBD
+        INSTALL_DATA_SUB ${LIBAREA}/libhugetlbfs/elf.xBD    
${PHASEPATH}/64/elf.xBD
         INSTALL_DATA_SUB ${LIB32AREA}/libhugetlbfs/elf.xBD      
${PHASEPATH}/32/elf.xBD
 
-        INSTALL_DATA_SUB ${LIBAREA}/libhugetlbfs/elf_1G.xBD    
${PHASEPATH}/elf_1G.xBD
+        INSTALL_DATA_SUB ${LIBAREA}/libhugetlbfs/elf_1G.xBD    
${PHASEPATH}/64/elf_1G.xBD
         INSTALL_DATA_SUB ${LIB32AREA}/libhugetlbfs/elf_1G.xBD      
${PHASEPATH}/32/elf_1G.xBD
 
     fi


------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Open64-devel mailing list
Open64-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/open64-devel

Reply via email to