diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Module.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 5 |
5 files changed, 2 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in index 6316cd809d4d..5144f6fa5e27 100644 --- a/Makefile.in +++ b/Makefile.in @@ -222,7 +222,7 @@ build-nocheck: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cro $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build cross-toolset: bootstrap fetch - $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild + $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build # # Install diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 30a1d9f23ca1..aa3900b0cafb 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -51,10 +51,8 @@ endif # gb_CppunitTest_TARGETTYPE # gb_CppunitTest_get_filename # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell -ifneq ($(CROSS_COMPILING),YES) gb_CppunitTest_CPPTESTDEPS := $(call gb_Executable_get_runtime_dependencies,cppunit/cppunittester) gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_target_for_build,cppunit/cppunittester) -endif gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 80e90bbf8400..2ef383ac147a 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -92,7 +92,7 @@ $(call gb_Module_get_target,%) : .PHONY : all build unitcheck slowcheck subsequentcheck clean check debugrun help showmodules translations .DEFAULT_GOAL := all -all : build unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck) +all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck)) build : $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6) diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 533aef8d691a..5686e06cce0b 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -318,11 +318,7 @@ endef # CppunitTest class -ifeq ($(CROSS_COMPILING),YES) -gb_CppunitTest_CPPTESTPRECOMMAND := : -else gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path) -endif gb_CppunitTest_SYSPRE := itest_ gb_CppunitTest_EXT := .lib gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 4065fa012370..c6717b0cbdb0 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -304,12 +304,7 @@ endef # CppunitTest class -ifeq ($(CROSS_COMPILING),YES) -gb_CppunitTest_CPPTESTPRECOMMAND := : -else gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path) -endif - gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .dylib gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) |