diff options
Diffstat (limited to 'solenv/gbuild/gbuild.mk')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index a8f76bffd204..9d521c79c092 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -165,17 +165,20 @@ endif include $(GBUILDDIR)/Helper.mk include $(GBUILDDIR)/TargetLocations.mk +include $(GBUILDDIR)/Tempfile.mk $(eval $(call gb_Helper_init_registries)) include $(SRCDIR)/Repository.mk include $(SRCDIR)/RepositoryExternal.mk -$(eval $(call gb_Helper_collect_libtargets)) +$(eval $(call gb_Helper_collect_knownlibs)) gb_Library_DLLPOSTFIX := lo # Include platform/cpu/compiler specific config/definitions include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk +include $(SRCDIR)/RepositoryFixes.mk + ifeq ($(CROSS_COMPILING),YES) # We can safely Assume all cross-compilation is from Unix systems. gb_Executable_EXT_for_build := @@ -229,12 +232,6 @@ else gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp) endif -include $(GBUILDDIR)/Tempfile.mk - -include $(SRCDIR)/RepositoryFixes.mk - -$(eval $(call gb_Helper_collect_knownlibs)) - # add user-supplied flags ifneq ($(strip gb__ENV_CFLAGS),) gb_LinkTarget_CFLAGS += $(gb__ENV_CFLAGS) |