diff options
| author |   Andrew Clemons <andrew.clemons@gmail.com> | 2024-04-13 13:04:33 +0900 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-04-13 22:03:57 +0700 |
| commit | 807ff51345edcc922074a94da70800070aeb50f2 (patch) | |
| tree | 92e9306eb9c749b34aed0dd4d3aaddc813b4cadf | |
| parent | 19fc7bf6ceef79bc77baaf1da801d3c17019b836 (diff) | |
| download | slackbuilds-807ff51345edcc922074a94da70800070aeb50f2.tar.gz slackbuilds-807ff51345edcc922074a94da70800070aeb50f2.tar.xz | |
development/Catch2: Fix multilib check.
Check if the multilib flag is not explicitly set. Otherwise we
overwrite whatever was passed in through the env.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | development/Catch2/Catch2.SlackBuild | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/development/Catch2/Catch2.SlackBuild b/development/Catch2/Catch2.SlackBuild index 1b0dbedc52..0432421d8a 100644 --- a/development/Catch2/Catch2.SlackBuild +++ b/development/Catch2/Catch2.SlackBuild @@ -65,11 +65,13 @@ fi #Test for multilib COMPAT32=${COMPAT32@L} -COMPATTMP="$( mktemp -d $TMP/compat32-test-XXXXXX )" -echo "int main(void) {; return(0); }" > "$COMPATTMP/test.c" -gcc -m32 "$COMPATTMP/test.c" -o /dev/null >/dev/null 2>&1 \ - && COMPAT32=${COMPAT32:-yes} -rm -rf "$COMPATTMP" +if [ "$COMPAT32" = "" ] ; then + COMPATTMP="$( mktemp -d $TMP/compat32-test-XXXXXX )" + echo "int main(void) {; return(0); }" > "$COMPATTMP/test.c" + gcc -m32 "$COMPATTMP/test.c" -o /dev/null >/dev/null 2>&1 \ + && COMPAT32=${COMPAT32:-yes} + rm -rf "$COMPATTMP" +fi set -e |