diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-01-31 14:39:06 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-02-01 11:27:15 +0000 |
| commit | b4801abd2ee1ffa037e654731ffc20d6ff2c701c (patch) | |
| tree | eb5b2f8ef79fe1a8c87a1c56d6142fb1d778a8d1 /solenv | |
| parent | 143ecebc73e84dfcafdc2577f811152b4a415fde (diff) | |
gbuild: copy stdlibs into solver again when they are bundled in the installer
Otherwise the build --without-system-stdlibs fails; This option is used
for the universal Linux build
Change-Id: I0f7d87bb161d50748fee05f9c3f6a4b87b788aa4
Reviewed-on: https://gerrit.libreoffice.org/1938
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 039333b3eac1..76a63e0c21a9 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -52,6 +52,9 @@ endif gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }') +gb_SHORTSTDC3 := 1 +gb_SHORTSTDCPP3 := 6 + gb_CPPU_ENV := gcc3 gb_AFLAGS := $(AFLAGS) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 5f1eb80dd6ed..206a598d14d6 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -364,18 +364,14 @@ endef # InstallModuleTarget class -# NOTE: values of SHORTSTDC3 and SHORTSTDCPP3 are hardcoded, because we -# do not really need all the variability of definition that was -# originally in solenv/inc/tg_compv.mk . Each of the macros is only used -# on one place, and only for Linux. define gb_InstallModuleTarget_InstallModuleTarget_platform $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ -DCOMNAME=gcc3 \ - -DSHORTSTDC3=1 \ - -DSHORTSTDCPP3=6 \ + -DSHORTSTDC3=$(gb_SHORTSTDC3) \ + -DSHORTSTDCPP3=$(gb_SHORTSTDCPP3) \ -D_gcc3 \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) |