Revert "Fix toolchain name for Tizen build"

This reverts commit 9ca781ab10eb319280f4c6873cb58241075d9725.

Change-Id: Ifcbf4179517cc5613f01def8df85d35b815abebd
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/SConstruct b/SConstruct
index 5aa49be6d491fe34de5860ddef44d6e8d8c23f01..c0cf6d6393810bfd5f995dadfd7f36200949cae7 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -168,8 +168,8 @@ if env['arch'] == 'armv7a':
     env.Append(CXXFLAGS = ['-march=armv7-a', '-mthumb', '-mfpu=neon'])
 
     if env['os'] == 'linux':
-        prefix = "armv7l-tizen-linux-gnueabi-"
-        env.Append(CXXFLAGS = ['-mfloat-abi=softfp'])
+        prefix = "arm-linux-gnueabihf-"
+        env.Append(CXXFLAGS = ['-mfloat-abi=hard'])
     elif env['os'] == 'bare_metal':
         prefix = "arm-eabi-"
         env.Append(CXXFLAGS = ['-mfloat-abi=hard'])
@@ -180,7 +180,7 @@ elif env['arch'] == 'arm64-v8a':
     env.Append(CXXFLAGS = ['-march=armv8-a'])
     env.Append(CPPDEFINES = ['ARM_COMPUTE_AARCH64_V8A'])
     if env['os'] == 'linux':
-        prefix = "aarch64-tizen-linux-gnu-"
+        prefix = "aarch64-linux-gnu-"
     elif env['os'] == 'bare_metal':
         prefix = "aarch64-elf-"
     elif env['os'] == 'android':
@@ -191,7 +191,7 @@ elif 'arm64-v8.2-a' in env['arch']:
     else:
         env.Append(CXXFLAGS = ['-march=armv8.2-a+fp16']) # explicitly enable fp16 extension otherwise __ARM_FEATURE_FP16_VECTOR_ARITHMETIC is undefined
     if env['os'] == 'linux':
-        prefix = "aarch64-tizen-linux-gnu-"
+        prefix = "aarch64-linux-gnu-"
     elif env['os'] == 'bare_metal':
         prefix = "aarch64-elf-"
     elif env['os'] == 'android':
@@ -215,8 +215,8 @@ env['CC'] = env['compiler_cache']+" "+prefix + c_compiler
 env['CXX'] = env['compiler_cache']+" "+prefix + cpp_compiler
 env['LD'] = prefix + "ld"
 env['AS'] = prefix + "as"
-env['AR'] = prefix + "gcc-ar"
-env['RANLIB'] = prefix + "gcc-ranlib"
+env['AR'] = prefix + "ar"
+env['RANLIB'] = prefix + "ranlib"
 
 if not GetOption("help"):
     try: