[Libreoffice-commits] core.git: solenv/gbuild

Tor Lillqvist tml at collabora.com
Tue Aug 2 10:24:19 UTC 2016


 solenv/gbuild/platform/com_GCC_defs.mk |    3 ---
 solenv/gbuild/platform/solaris.mk      |    2 --
 solenv/gbuild/platform/unxgcc.mk       |    2 --
 3 files changed, 7 deletions(-)

New commits:
commit 78cdd1b224b9e3f2ed318c9e4b04c5d04abea603
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 2 12:38:20 2016 +0300

    Remove some presumably unnecessary leftovers from ancient times
    
    I could not find that SHORTSTDC3 or SHORTSTDCPP3 would have any
    meaning. They only occur here (and in our history).
    
    Change-Id: I45141e60c144207fbf3fc0c5e59340b80951b212

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 10f9a47..d44b3ee 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -39,9 +39,6 @@ ifeq ($(strip $(gb_COMPILEROPTFLAGS)),)
 gb_COMPILEROPTFLAGS := -O2
 endif
 
-gb_SHORTSTDC3 := 1
-gb_SHORTSTDCPP3 := 6
-
 gb_CPPU_ENV := gcc3
 
 gb_AFLAGS := $(AFLAGS)
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 0b1cb0c..1e9a1f3 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -315,8 +315,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 	$(gb_CPUDEFS) \
 	$(gb_OSDEFS) \
 	-DCOMID=gcc3 \
-	-DSHORTSTDC3=$(gb_SHORTSTDC3) \
-	-DSHORTSTDCPP3=$(gb_SHORTSTDCPP3) \
 	-D_gcc3 \
 )
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 4d3ede2..d6b9fcfe 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -314,8 +314,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
 	$(gb_CPUDEFS) \
 	$(gb_OSDEFS) \
 	-DCOMID=gcc3 \
-	-DSHORTSTDC3=$(gb_SHORTSTDC3) \
-	-DSHORTSTDCPP3=$(gb_SHORTSTDCPP3) \
 	-D_gcc3 \
 )
 


More information about the Libreoffice-commits mailing list