[Libreoffice-commits] core.git: odk/build-examples_common.mk

[Stephan Bergmann (via logerrit)]

 odk/build-examples_common.mk |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ac4f30fdf808bfbb7c8f534661851d10301bbcad
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Jan 5 22:34:28 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Jan 6 10:31:54 2020 +0100

    Fix MACOSX_SHELL_HACK
    
    ...so that it is set and actually takes effect when the definition of
    odk_build-examples_test is expanded
    
    Change-Id: I0a4ca22f3b7b17d802dae9195954b030cde9ddac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86251
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index 50ea40ec905e..23c552efd177 100644
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -7,10 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-define odk_build-examples_test
-
-$(eval $(call gb_CustomTarget_CustomTarget,$(1)))
-
 # System-provided shells on macOS are known to unset DYLD_LIBRARY_PATH, so we need some sort of hack
 # to provided the invocation of make below with a shell that preserves DYLD_LIBRARY_PATH.  Until
 # macOS 10.14, what apparently worked is to use a copy of /bin/sh in some temp dir.  However, with
@@ -28,6 +24,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,$(1)))
 # avoid surprises, use an explicit check for an origin of "command line" here.)
 MACOSX_SHELL_HACK := $(and $(filter MACOSX,$(OS)),$(filter-out command line,$(origin SHELL)))
 
+define odk_build-examples_test
+
+$(eval $(call gb_CustomTarget_CustomTarget,$(1)))
+
 $(call gb_CustomTarget_get_target,$(1)): \
 	$(call gb_CustomTarget_get_workdir,$(1))/setsdkenv
 ifneq ($(gb_SUPPRESS_TESTS),)