Bug 1237872 - fix nspr build, r=me

sailfishos-mirror · Nov 15, 2016 · bd643c3 · bd643c3
1 parent 9122b8e
commit bd643c3
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/coreconf/nspr.sh b/coreconf/nspr.sh
@@ -17,20 +17,32 @@ nspr_sanitizer()
     nspr_ldflags="$nspr_ldflags $(python $cwd/coreconf/sanitizers.py $1 $2)"
 }
 
+verbose()
+{
+    CFLAGS=$nspr_cflags CXXFLAGS=$nspr_cxxflags LDFLAGS=$nspr_ldflags \
+      CC=$CC CXX=$CCC ../configure "${nspr_opt[@]}" --prefix="$obj_dir"
+    make -C "$cwd/../nspr/$target"
+    make -C "$cwd/../nspr/$target" install
+}
+
+silent()
+{
+    echo "[1/3] configure NSPR ..."
+    CFLAGS=$nspr_cflags CXXFLAGS=$nspr_cxxflags LDFLAGS=$nspr_ldflags \
+      CC=$CC CXX=$CCC ../configure "${nspr_opt[@]}" --prefix="$obj_dir" 1> /dev/null
+    echo "[2/3] make NSPR ..."
+    make -C "$cwd/../nspr/$target" 1> /dev/null
+    echo "[3/3] install NSPR ..."
+    make -C "$cwd/../nspr/$target" install 1> /dev/null
+}
+
 build_nspr()
 {
     mkdir -p "$cwd/../nspr/$target"
     cd "$cwd/../nspr/$target"
     if [ "$1" == 1 ]; then
-        out=/dev/stdout
+        verbose
     else
-        out=/dev/null
+        silent
     fi
-    echo "[1/3] configure NSPR ..."
-    CFLAGS=$nspr_cflags CXXFLAGS=$nspr_cxxflags LDFLAGS=$nspr_ldflags \
-      CC=$CC CXX=$CCC ../configure "${nspr_opt[@]}" --prefix="$obj_dir" 1> $out
-    echo "[2/3] make NSPR ..."
-    make -C "$cwd/../nspr/$target" 1> $out
-    echo "[3/3] install NSPR ..."
-    make -C "$cwd/../nspr/$target" install 1> $out
 }