From d7c8ef19650b6e98dc5b71a482b314db426c1288 Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Tue, 1 Sep 2015 23:43:50 +0000
Subject: [PATCH] Updates for solaris
---
SConscript | 6 +++++-
SConstruct | 28 ++++++++++------------------
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/SConscript b/SConscript
index 65a0389..de56959 100644
--- a/SConscript
+++ b/SConscript
@@ -4,6 +4,9 @@ import tarfile
Import('env')
+(sysname, nodename, release, version, machine)=os.uname()
+
+
#print 'env='
#print env.Dump()
@@ -48,7 +51,8 @@ libpath='''
$SECURITY_TRANSFORMS_HOME/lib
'''
-myenv.Append(CCFLAGS=" -Wall ")
+if sysname != "SunOS":
+ myenv.Append(CCFLAGS=" -Wall ")
myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath), SHLIBSUFFIX=".zpi", SHLIBPREFIX="")
lib=myenv.SharedLibrary("push64_relocs", Split(files))
diff --git a/SConstruct b/SConstruct
index 1ef882f..6b5cd6b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,6 +1,10 @@
import os
import sys
+(sysname, nodename, release, version, machine)=os.uname()
+
+
+
env=Environment()
@@ -28,24 +32,12 @@ else:
env.Append(CFLAGS=" -O3")
env.Append(CXXFLAGS=" -O3")
env.Append(LINKFLAGS=" -O3")
-#env.Append(CXXFLAGS=" -std=c++0x")
-
-# set 32/64 bit build properly
-#print "env[64bit]="+str(env['do_64bit_build'])
-#if env['do_64bit_build'] is None:
-# print 'Defaulting to default compilation size.'
-#elif int(env['do_64bit_build']) == 1:
-# print 'Using 64-bit compilation size.'
-# env.Append(CFLAGS=" -m64")
-# env.Append(CXXFLAGS=" -m64")
-# env.Append(LINKFLAGS=" -m64")
-# env.Append(SHLINKFLAGS=" -m64")
-#else:
-# print 'Using 32-bit compilation size.'
-# env.Append(CFLAGS=" -m32")
-# env.Append(CXXFLAGS=" -m32")
-# env.Append(LINKFLAGS=" -m32")
-# env.Append(SHLINKFLAGS=" -m32")
+
+if sysname == "SunOS":
+ env.Append(LINKFLAGS=" -L/opt/csw/lib -DSOLARIS ")
+ env.Append(CFLAGS=" -I/opt/csw/include -DSOLARIS ")
+ env.Append(CXXFLAGS=" -I/opt/csw/include -DSOLARIS ")
+
env['build_appfw']=0
env['build_tools']=0
--
GitLab