[Lunar-commits] r14649 - lunar/trunk/var/lib/lunar/functions

Sat May 7 20:32:16 UTC 2005

Author: sofar
Date: 2005-05-07 20:32:13 +0000 (Sat, 07 May 2005)
New Revision: 14649

Modified:
   lunar/trunk/var/lib/lunar/functions/depends.lunar
   lunar/trunk/var/lib/lunar/functions/optimize.lunar
Log:
Optimization fix for LDFLAGS, and also a very outdated fix I think is needed for a lot of things-> in_depends() function.


Modified: lunar/trunk/var/lib/lunar/functions/depends.lunar
===================================================================

--- lunar/trunk/var/lib/lunar/functions/depends.lunar	2005-05-07 17:59:01 UTC (rev 14648)
+++ lunar/trunk/var/lib/lunar/functions/depends.lunar	2005-05-07 20:32:13 UTC (rev 14649)
@@ -104,7 +104,7 @@
 in_depends()  {
   debug_msg "in_depends ($@)"
   # Was $2 presented as a depenency for module $1
-  return $(grep -q "^$1:$2:" $DEPENDS_STATUS)
+  return $(grep -q "^$1:$2:on:" $DEPENDS_STATUS)
 }
                                                                                 
                                                                                 

Modified: lunar/trunk/var/lib/lunar/functions/optimize.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/optimize.lunar	2005-05-07 17:59:01 UTC (rev 14648)
+++ lunar/trunk/var/lib/lunar/functions/optimize.lunar	2005-05-07 20:32:13 UTC (rev 14649)
@@ -632,27 +632,22 @@
 # Set up the Linker optimizations
 optimize_ld() {
   debug_msg "optimize_ld ($@)"
-   if [[ $LDFLAGS ]]; then
-      unset LDFLAGS
-   fi
+  if [[ $LDFLAGS ]]; then
+    unset LDFLAGS
+  fi
 
-   for A in ${LDF[@]}; do
-      case $A in
-         Strip)     LDFLAGS="$LDFLAGS -s"
-                    ;;
-         Optimize)  WL="$WL,-O1"
-                    ;;
-         Reduce)    WL="$WL,--as-needed"
-                    ;;
-         Debug)     LDFLAGS="$LDFLAGS -S"
-                    ;;
-         Combreloc) LDFLAGS="$LDFLAGS -z combreloc"
-                    ;;
-      esac
-	  if [ -n "$WL" ]; then
-	    LDFLAGS="$LDFLAGS -Wl$WL"
-	  fi
-   done
+  for A in ${LDF[@]}; do
+    case $A in
+      Strip)     LDFLAGS="$LDFLAGS -s"           ;;
+      Optimize)  WL="$WL,-O1"                    ;;
+      Reduce)    WL="$WL,--as-needed"            ;;
+      Debug)     LDFLAGS="$LDFLAGS -S"           ;;
+      Combreloc) LDFLAGS="$LDFLAGS -z combreloc" ;;
+    esac
+  done
+  if [ -n "$WL" ]; then
+    LDFLAGS="$LDFLAGS -Wl$WL"
+  fi
 }
 
 

