You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2020/07/05 05:57:37 UTC
[openoffice] 03/04: ENABLE_SYMBOLS can be None.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch scons-build
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit c6a21cc9df371553c988aa43da6d24fd1059d5c9
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Jul 5 05:11:46 2020 +0200
ENABLE_SYMBOLS can be None.
Patch by: me
---
main/site_scons/sharedObjects.py | 4 ++--
main/site_scons/site_init.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/main/site_scons/sharedObjects.py b/main/site_scons/sharedObjects.py
index 0d068b5..6756cbd 100644
--- a/main/site_scons/sharedObjects.py
+++ b/main/site_scons/sharedObjects.py
@@ -28,8 +28,8 @@ class AOOSharedObjects:
self.env = DefaultEnvironment().Clone()
self.env.Append(CPPDEFINES=platform.getLibraryDefs(soenv))
if DEBUGGING:
- self.env.Append(CFLAGS=platform.getDebugCFlags(soenv['COM'], soenv['ENABLE_SYMBOLS']))
- self.env.Append(CXXFLAGS=platform.getDebugCFlags(soenv['COM'], soenv['ENABLE_SYMBOLS']))
+ self.env.Append(CFLAGS=platform.getDebugCFlags(soenv['COM'], soenv.get('ENABLE_SYMBOLS')))
+ self.env.Append(CXXFLAGS=platform.getDebugCFlags(soenv['COM'], soenv.get('ENABLE_SYMBOLS')))
self.objects = []
def AddDefs(self, defs):
diff --git a/main/site_scons/site_init.py b/main/site_scons/site_init.py
index 5c1e6ae..ce31f8f 100644
--- a/main/site_scons/site_init.py
+++ b/main/site_scons/site_init.py
@@ -83,8 +83,8 @@ def CreateSharedLibraryEnvironment(name, group):
cflags = platform.getCFlags(soenv)
cxxflags = platform.getCXXFlags(soenv)
if DEBUGGING:
- cflags += platform.getDebugCFlags(soenv['COM'], soenv['ENABLE_SYMBOLS'])
- cxxflags += platform.getDebugCFlags(soenv['COM'], soenv['ENABLE_SYMBOLS'])
+ cflags += platform.getDebugCFlags(soenv['COM'], soenv.get('ENABLE_SYMBOLS'))
+ cxxflags += platform.getDebugCFlags(soenv['COM'], soenv.get('ENABLE_SYMBOLS'))
env.Append(CFLAGS=cflags)
print("APPENDING " + str(cxxflags))
env.Replace(CXXFLAGS=cxxflags)