From 84507ad26b70061bd1e46b5b7c458ad61ec2cd96 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 21 Sep 2013 22:30:23 +0200 Subject: gbuild: drop mkdir -p calls from gb_LinkTarget__command ... should be obsoleted by previous commit. Change-Id: I378de1465d293a60dc20c545770f029c8f71bd50 --- solenv/gbuild/platform/IOS_ARM_GCC.mk | 2 -- solenv/gbuild/platform/android.mk | 3 +-- solenv/gbuild/platform/com_MSC_class.mk | 1 - solenv/gbuild/platform/macosx.mk | 2 -- solenv/gbuild/platform/mingw.mk | 3 --- solenv/gbuild/platform/solaris.mk | 2 -- solenv/gbuild/platform/unxgcc.mk | 2 -- 7 files changed, 1 insertion(+), 14 deletions(-) diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 57c695cb3d43..bb661b3e57e5 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -105,7 +105,6 @@ endef define gb_LinkTarget__command_dynamiclink $(if $(filter Library CppunitTest,$(TARGETTYPE)),@echo No dynamic libraries should be built for iOS && exit 1, \ - mkdir -p $(dir $(1)) && \ $(if $(CXXOBJECTS)$(OBJCXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(gb_Executable_TARGETTYPEFLAGS) \ $(subst \d,$$,$(RPATH)) \ @@ -129,7 +128,6 @@ endef # parameters: 1-linktarget 2-cobjects 3-cxxobjects define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ rm -f $(1) && \ $(gb_AR) -rsu $(1) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index 23839b1a4693..b3ed340bb149 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -35,7 +35,6 @@ gb_LinkTarget_LDFLAGS += \ define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ -shared \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ @@ -110,7 +109,7 @@ gb_CppunitTest_get_filename = libtest_$(1).a define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) $(if $(filter CppunitTest,$(TARGETTYPE)), \ - mkdir -p $(dir $(1)) && touch $(1), \ + touch $(1), \ $(call gb_LinkTarget__command_staticlink,$(1))) endef diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 73f4a235381e..beb82661d716 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -168,7 +168,6 @@ endif define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ rm -f $(1) && \ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100, \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index e23fd94eca60..287a8ebc4ae3 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -133,7 +133,6 @@ endef define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ $(if $(CXXOBJECTS)$(OBJCXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \ @@ -177,7 +176,6 @@ endef # parameters: 1-linktarget 2-cobjects 3-cxxobjects define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ rm -f $(1) && \ $(gb_AR) -rsu $(1) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index c3b319eaae1b..c4fb456c0064 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -96,7 +96,6 @@ gb_LinkTarget_INCLUDE +=\ define gb_LinkTarget__command_dynamiclinkexecutable $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) $(strip \ $(gb_Executable_TARGETTYPEFLAGS) \ $(if $(filter YES,$(TARGETGUI)), -mwindows, -mconsole) \ @@ -117,7 +116,6 @@ endef define gb_LinkTarget__command_dynamiclinklibrary $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) $(strip \ $(gb_Library_TARGETTYPEFLAGS) \ $(T_LDFLAGS) \ @@ -139,7 +137,6 @@ endef define gb_LinkTarget__command_staticlinklibrary $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ rm -f $(1) && \ $(gb_AR) -rsu $(1) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 8505f06669dc..017dafc6bc9b 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -168,7 +168,6 @@ endif # we want to use @$(extraobjectlist) in the long run define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call gb_Library__get_workdir_linktargetname,$(lib))),$(2)),$(gb_LTOFLAGS)) \ @@ -205,7 +204,6 @@ endef define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ rm -f $(1) && \ $(gb_AR) -rsu $(1) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index c839db111fff..9ad883b85503 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -170,7 +170,6 @@ endif # link with C compiler if there are no C++ files (pyuno_wrapper depends on this) define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call gb_Library__get_workdir_linktargetname,$(lib))),$(2)),$(gb_LTOFLAGS)) \ @@ -207,7 +206,6 @@ endef define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ rm -f $(1) && \ $(gb_AR) -rsu $(1) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ -- cgit v1.2.3