diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2020-03-23 16:28:53 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2020-03-23 18:46:43 +0100 |
commit | 5feadfad0cc3be2680213d2e5f6f786b2f4cc74f (patch) | |
tree | 604565a5381728e2280a9438ec1515d9f4ea60f0 /config_host.mk.in | |
parent | 05022d6cfff72d26fa3b916a4f86ac6488298dac (diff) |
actually export $NINJA from configure
I based the check on the gmake check, but that one doesn't need
the export, as gmake is what needs to be called for the build
to start. But ninja is currently only used during building NSS.
Also do not use Windows path for ninja on Windows, as NSS
actually invokes it from a shell script.
Change-Id: I0d8a86ee3688f27a376d547cd946bb4c59a547a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90922
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'config_host.mk.in')
-rw-r--r-- | config_host.mk.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 13e5e906a3f6..d9528c25c0d2 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -425,6 +425,7 @@ export NASM=@NASM@ export NEON_CFLAGS=$(gb_SPACE)@NEON_CFLAGS@ export NEON_LIBS=$(gb_SPACE)@NEON_LIBS@ export NEON_VERSION=@NEON_VERSION@ +export NINJA=@NINJA@ export NM=@NM@ export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@ export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@ |