diff options
| author | Andrzej Hunt <andrzej@ahunt.org> | 2015-06-04 14:02:05 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:56:25 +0200 |
| commit | 3330d60dbf629312fc6866589254800a661669fc (patch) | |
| tree | 0e9df5a10c3cc149b0c51f6239ad1f5639584614 /configure.ac | |
| parent | tdf#92654 a "Date" can contain a Time, so don't loose date by default (diff) | |
| download | core-3330d60dbf629312fc6866589254800a661669fc.tar.gz core-3330d60dbf629312fc6866589254800a661669fc.zip | |
Fix using /opt/lo/bin/nasm on windows/cygwin
Change-Id: Ib3755598bfccffc2efd67816ae5fa5dc8903553e
Reviewed-on: https://gerrit.libreoffice.org/16083
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit a3afa22ba4069212213009fc7304adc3c339b68b)
Reviewed-on: https://gerrit.libreoffice.org/17124
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 90b13c8de5ea..cf63d276560c 100644 --- a/configure.ac +++ b/configure.ac @@ -7459,7 +7459,7 @@ else if test -z "$NASM" -a "$build_os" = "cygwin"; then if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/nasm"; then NASM="$LODE_HOME/opt/bin/nasm" - elif -x "/opt/lo/bin/nasm"; then + elif test -x "/opt/lo/bin/nasm"; then NASM="/opt/lo/bin/nasm" fi fi |