Changeset 3429

Timestamp:

04/14/08 13:08:55 (5 months ago)

Author:

larsivi

Message:

Install gdc runtime to lib64 if present, closes #976

Files:

• trunk/lib/install-gdc.sh (modified) (5 diffs)

trunk/lib/install-gdc.sh

@@ -60 +60 @@
-GPHOBOS_DIR="`dirname $GPHOBOS_DIR`"
-
+GPHOBOS_64=0
+
-# If we have which, use it to get the prefix
-which gdc >& /dev/null
@@ -76 +78 @@
-fi
-
+if [ -e "$GPHOBOS_DIR/../lib64" ]
+then
+    GPHOBOS_64=1
+fi
+
-GDC_VER="`${CROSS}gdc -dumpversion`"
-GDC_MCH="`${CROSS}gdc -dumpmachine`"
@@ -88 +95 @@
-if [ "$UNINSTALL" = "1" ]
-then
-    if [ ! -e "$GPHOBOS_DIR/libgphobos.a.phobos" ]
-    then
-        die "tango does not appear to be installed!" 3
-    fi
-    if [ "$INPLACE" = "0" ]
-    then
-        rm -rf $GPHOBOS_DIR/libgphobos.a $PREFIX/include/d/$GDC_VER/object.d
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    fi
-    die "Done!" 0
@@ -113 +127 @@
-    mv -f $GPHOBOS_DIR/libgphobos.a $GPHOBOS_DIR/libgphobos.a.phobos
-    mv -f $PREFIX/include/d/$GDC_VER/object.d $PREFIX/include/d/$GDC_VER/object.d.phobos
+    if [ "$GPHOBOS_64" = "1" ]
+    then
+        if [ -e "$GPHOBOS_DIR/../lib64/libgphobos.a" ]
+        then
+            mv -f $GPHOBOS_DIR7../lib64/libgphobos.a $GPHOBOS_DIR/../lib64/libgphobos.a.phobos
+        fi
+    fi
-fi
-
@@ -121 +142 @@
-    mkdir -p $PREFIX/include/d/$GDC_VER || die "Failed to create include/d/$GDC_VER (maybe you need root privileges?)" 5
-    cp -pRvf libgphobos.a $GPHOBOS_DIR || die "Failed to copy libraries" 7
+    if [ "$GPHOBOS_64" = "1" ]
+    then
+        cp -pRvf libgphobos.a $GPHOBOS_DIR/../lib64 || die "Failed to copy libraries" 7
+    fi
+
-    cp -pRvf ../object.di $PREFIX/include/d/$GDC_VER/object.d || die "Failed to copy source" 8
-    if [ ! -e $PREFIX/include/d/$GDC_VER/gcc ]