From c9c963d3e6991d0dd73a95fc9734e38683d5be9c Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 11 Apr 2013 11:02:39 +0200 Subject: autoinstall ure private libraries Change-Id: Ia390c4d4a9be4b5520fd82a573029ea242f9ffb9 --- solenv/gbuild/Helper.mk | 2 +- solenv/gbuild/platform/IOS_ARM_GCC.mk | 1 - solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1 - solenv/gbuild/platform/com_MSC_class.mk | 1 - solenv/gbuild/platform/macosx.mk | 1 - solenv/gbuild/platform/solaris.mk | 1 - solenv/gbuild/platform/unxgcc.mk | 1 - 7 files changed, 1 insertion(+), 7 deletions(-) (limited to 'solenv/gbuild') diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index f5f205bb65f2..05e5489164fd 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -118,7 +118,7 @@ endef define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS -gb_Library_VALIDINSTALLMODULES := OOO +gb_Library_VALIDINSTALLMODULES := OOO URE gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_Jar_VALIDGROUPS := URE OOO OXT diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 466a82167aaa..fa070caf2f58 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -251,7 +251,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - -DCOMNAME=gcc3 \ -D_gcc3 \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 42e1dda7f1e4..469bb5f92471 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -385,7 +385,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - -DCOMNAME=gcc3 \ -D_gcc3 \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 12227ab7e27d..e3fc4d77cc69 100755 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -544,7 +544,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=MSC \ - -DCOMNAME=$(if $(filter INTEL,$(CPUNAME)),msci,mscx) \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index eababb85cef6..88e0953ec8d2 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -321,7 +321,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - -DCOMNAME=gcc3 \ -D_gcc3 \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 968b1a30f153..d8bb1c8bf588 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -378,7 +378,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - -DCOMNAME=gcc3 \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index e295edba1de4..ae9081fef33b 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -373,7 +373,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - -DCOMNAME=gcc3 \ -DSHORTSTDC3=$(gb_SHORTSTDC3) \ -DSHORTSTDCPP3=$(gb_SHORTSTDCPP3) \ -D_gcc3 \ -- cgit