Changeset 36 in flair-dev for trunk/scripts/flair_compile_all.sh

Timestamp:

11/03/16 11:14:54 (7 years ago)

Author:

Sanahuja Guillaume

Message:

m

File:

• trunk/scripts/flair_compile_all.sh (modified) (2 diffs)

trunk/scripts/flair_compile_all.sh

@@ -31 +31 @@
                 cd $1/$2
 
-                if [ -f cmake_codeblocks.sh ]; then
-                        green_echo "only configuring it for $(uname -m)"
-                        ./cmake_codeblocks.sh > /dev/null
-                else
-                        rm -f build_arm/CMakeCache.txt
-                        $FLAIR_ROOT/flair-dev/scripts/cmake_codeblocks.sh > /dev/null
-                fi
+                rm -f build_arm/CMakeCache.txt
+                $FLAIR_ROOT/flair-dev/scripts/cmake_codeblocks.sh > /dev/null
         
                 check_error
@@ -46 +41 @@
 
 function cross_compile () {
-        if ! [ -f  $1/$2/cmake_codeblocks.sh ]; then
-                green_echo "Cross compiling and installing $2"
-                cd $1/$2/build_arm
-                if [ "$from_scratch" = "yes" ]; then make clean > /dev/null; fi
-                make -j$NB_THREADS > /dev/null
-                check_error
-                make install
-        fi
+        green_echo "Cross compiling and installing $2"
+        cd $1/$2/build_arm
+        if [ "$from_scratch" = "yes" ]; then make clean > /dev/null; fi
+        make -j$NB_THREADS > /dev/null
+        check_error
+        make install
 }