summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CC/foreign/cmake/EXPRESSIONS4
-rw-r--r--CC/foreign/make/EXPRESSIONS4
2 files changed, 4 insertions, 4 deletions
diff --git a/CC/foreign/cmake/EXPRESSIONS b/CC/foreign/cmake/EXPRESSIONS
index bdb05ce..53d6497 100644
--- a/CC/foreign/cmake/EXPRESSIONS
+++ b/CC/foreign/cmake/EXPRESSIONS
@@ -179,7 +179,7 @@
, [ "readonly CMAKE_SUBDIR=\"$1\""
, "readonly CMAKE_AR=$(which $2)"
, "shift 2"
- , "cmake \"$@\" -S\"source/${CMAKE_SUBDIR}\" -Bbuild -DCMAKE_AR=${CMAKE_AR} -DCMAKE_INSTALL_PREFIX=./install >configure.log || (cat configure.log && exit 1)"
+ , "cmake \"$@\" -S\"source/${CMAKE_SUBDIR}\" -Bbuild -DCMAKE_AR=${CMAKE_AR} -DCMAKE_INSTALL_PREFIX=./install >configure.log 2>&1 || (cat configure.log && exit 1)"
]
, [ { "type": "join"
, "separator": " "
@@ -187,7 +187,7 @@
{ "type": "++"
, "$1":
[ {"type": "var", "name": "CMAKE_JOBS"}
- , [ "cmake --build build --target install >build.log || (cat configure.log build.log && exit 1)"
+ , [ "cmake --build build --target install >build.log 2>&1 || (cat configure.log build.log && exit 1)"
]
]
}
diff --git a/CC/foreign/make/EXPRESSIONS b/CC/foreign/make/EXPRESSIONS
index e175528..fb85101 100644
--- a/CC/foreign/make/EXPRESSIONS
+++ b/CC/foreign/make/EXPRESSIONS
@@ -277,7 +277,7 @@
, { "type": "join_cmd"
, "$1": {"type": "var", "name": "configure_args"}
}
- , " >\"${ROOT}/configure.log\" || (cat \"${ROOT}/configure.log\" && exit 1)"
+ , " >\"${ROOT}/configure.log\" 2>&1 || (cat \"${ROOT}/configure.log\" && exit 1)"
]
}
, ")"
@@ -293,7 +293,7 @@
, { "type": "join_cmd"
, "$1": [{"type": "var", "name": "target"}]
}
- , " >>build.log || (cat build.log && exit 1)"
+ , " >>build.log 2>&1 || (cat build.log && exit 1)"
]
}
}