Changeset 11fbfa9 for scripts/scripts/build-cross.sh

Timestamp:

Feb 21, 2006, 2:07:27 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

bc4ea88

Parents:

ec749f6

Message:

r1045@server (orig r1043): ryan | 2006-01-12 00:56:45 -0800

r1079@rei: lfs | 2006-01-12 19:13:09 +1100
Update for glibc-2.3.6
Also add option to skip libgcc_s.so.1 creation (to match cross-lfs book)

File:

• scripts/scripts/build-cross.sh (modified) (1 diff)

scripts/scripts/build-cross.sh

@@ -90 +90 @@
 }
 
-test "Y" = "${MULTIARCH}" &&
-{
-   script_list="${script_list}
+script_list="${script_list}
 cross-binutils.sh
 cross-glibc-hdrs.sh
-cross-gcc-static.sh
+cross-gcc-static.sh"
+
+if [ ! "Y" = "${NO_GCC_EH}" ]; then
+   if [ "Y" = "${MULTIARCH}" ]; then
+      script_list="${script_list}
 cross-glibc-crtobjs-32.sh
 cross-glibc-crtobjs-64.sh
 cross-gcc-shared.sh"
+   else
+      script_list="${script_list}
+cross-glibc-crtobjs.sh
+cross-gcc-shared.sh"
+   fi
+fi
 
-   test "N" = "${DEFAULT_64}" &&
-   {
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   if [ "N" = "${DEFAULT_64}" ]; then 
       script_list="${script_list}
 cross-glibc-full-64.sh
 cross-glibc-full-32.sh
 cross-gcc-final.sh"
-   } || {
+   else
       script_list="${script_list}
 cross-glibc-full-32.sh
 cross-glibc-full-64.sh
 cross-gcc-final.sh"
-   }
-
-} || {
+   fi
+else
    script_list="${script_list}
-cross-binutils.sh
-cross-glibc-hdrs.sh
-cross-gcc-static.sh
-cross-glibc-crtobjs.sh
-cross-gcc-shared.sh
 cross-glibc-full.sh
 cross-gcc-final.sh"
-}
+fi
 
 SCRIPTLIST=`echo "${script_list}" | \