X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build_common%2Ftizen%2FSConscript;h=f33ec469c5d6b27059bd3fe179c5655877452385;hb=74116f02ef4af167468a9d4fe92e82b8962e6469;hp=cc3b53527a3f6c8136590008c18426d247f0bd5c;hpb=2915615396fd9bb7f39b9d03d817e0376a8c7ffc;p=platform%2Fupstream%2Fiotivity.git

diff --git a/build_common/tizen/SConscript b/build_common/tizen/SConscript
index cc3b535..f33ec46 100644
--- a/build_common/tizen/SConscript
+++ b/build_common/tizen/SConscript
@@ -2,45 +2,29 @@
 # This script set linux specific flags (GNU GCC)
 #
 ##
+import os
+import SCons.Util
+
 Import('env')
 
 print "Reading linux configuration script"
 
 # Set release/debug flags
 if env.get('RELEASE'):
-	env.AppendUnique(CCFLAGS = ['-Os'])
 	env.AppendUnique(CPPDEFINES = ['NDEBUG'])
-else:
-	env.AppendUnique(CCFLAGS = ['-g'])
 
 if env.get('LOGGING'):
-	env.AppendUnique(CPPDEFINES = ['-DTB_LOG'])
+    env.AppendUnique(CPPDEFINES = ['-DTB_LOG'])
 
+env['CCFLAGS'] = SCons.Util.CLVar(os.environ.get('CFLAGS', ""))
 env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '__linux__'])
 env.AppendUnique(CFLAGS = ['-std=gnu99'])
-env.AppendUnique(CCFLAGS = ['-Wall', '-fPIC'])
-env.AppendUnique(LINKFLAGS = ['-ldl', '-lpthread'])
-
-if env.get('TARGET_OS') == 'tizen':
-    env.AppendUnique(CCFLAGS = ['-D__TIZEN__', '-DSLP_SDK_LOG', '-D_GNU_SOURCE', '-DTIZEN_DEBUG_ENABLE'])
-    env.ParseConfig("pkg-config dlog --cflags --libs")
+env.AppendUnique(CCFLAGS = ['-Wextra', '-fPIC'])
+env.AppendUnique(LIBS = ['dl', 'pthread'])
 
-# Set arch flags
-target_arch = env.get('TARGET_ARCH')
-if target_arch in ['x86']:
-	env.AppendUnique(CCFLAGS = ['-m32'])
-	env.AppendUnique(LINKFLAGS = ['-m32'])
-elif target_arch in ['x86_64']:
-	env.AppendUnique(CCFLAGS = ['-m64'])
-	env.AppendUnique(LINKFLAGS = ['-m64'])
-elif target_arch.find('v7a-hard') > 0:
-	env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
-	env.AppendUnique(CPPFLAGS = ['-mfloat-abi=hard'])
-	env.AppendUnique(CCFLAGS = ['-mfloat-abi=hard'])
-	env.AppendUnique(LINKFLAGS = ['-mfloat-abi=hard'])
-elif target_arch.find('v7a') > 0:
-	env.AppendUnique(CPPFLAGS = ['-march=armv7-a'])
-elif target_arch.find('arm64') >= 0:
-	env.AppendUnique(CPPFLAGS = ['-march=armv8-a'])
-else:
-	env.AppendUnique(CPPFLAGS = ['-march=armv5te'])
+env.AppendUnique(CCFLAGS = ['-D__TIZEN__', '-D_GNU_SOURCE', '-DTIZEN_DEBUG_ENABLE','-fstack-protector-strong','-Wl,-z,relro','-D_FORTIFY_SOURCE=2'])
+env.AppendUnique(LINKFLAGS = ['-Wl,-z,relro'])
+env.ParseConfig("pkg-config dlog --cflags --libs")
+if env.get('OIC_SUPPORT_TIZEN_TRACE') == 'True':
+    env.ParseConfig("pkg-config ttrace --cflags --libs")
+# Set arch flags : It will be handled by Tizen build system.