Remove mips32 compile option from makefile.
The mips32 is taken care of by the buildroot cross compiler configuration and
passed down accordingly. So no need to explicitly set it in subsequent make
files.
Change-Id: I75db863790eb48a765b42b51a9f3bcc0dcd7986d
diff --git a/talk/main.scons b/talk/main.scons
index 1177d16..5aecb22 100644
--- a/talk/main.scons
+++ b/talk/main.scons
@@ -426,19 +426,17 @@
'HAVE_DBUS_GLIB',
'dbus-glib-1')
-def linux_common_include_mipsel_32(env):
- """Include mipsel-32 settings into an env based on linux_common."""
+def linux_common_include_mipsel(env):
+ """Include mipsel settings into an env based on linux_common."""
env.Append(
CCFLAGS = [
'-Wno-unused-value',
'-pipe',
- '-mips32',
'-mmemcpy',
],
LINKFLAGS = [
'-Wno-unused-value',
'-pipe',
- '-mips32',
'-mmemcpy',
],
)
@@ -447,7 +445,7 @@
# L I N U X -- T R A D I T I O N A L -- M I P S
#
# Settings that are specific to Linux mips targets.
-linux_mipsel_32_env = linux_common_env.Clone(
+linux_mipsel_env = linux_common_env.Clone(
AR = CROSS_COMPILE + 'ar',
AS = CROSS_COMPILE + 'as',
CC = CROSS_COMPILE + 'gcc',
@@ -455,7 +453,7 @@
RANLIB = CROSS_COMPILE + 'ranlib',
NM = CROSS_COMPILE + 'nm',
)
-linux_common_include_mipsel_32(linux_mipsel_32_env)
+linux_common_include_mipsel(linux_mipsel_env)
def gen_linux_mips(base_env, type_suffix, desc_suffix):
linux_env = base_env.Clone()
@@ -489,7 +487,7 @@
linux_opt_env.Append(CCFLAGS = ['-Os'])
envs.append(linux_opt_env)
-gen_linux_mips(linux_mipsel_32_env, '', '')
+gen_linux_mips(linux_mipsel_env, '', '')
# TODO(): Clone linux envs for 64bit. See 'variant' documentation.
diff --git a/talk/site_scons/talk.py b/talk/site_scons/talk.py
index 36fcf49..87650fa 100644
--- a/talk/site_scons/talk.py
+++ b/talk/site_scons/talk.py
@@ -421,7 +421,8 @@
# only for the legacy mixed 32/64 desktop Linux build.
def EnableExtra64BitTargets(env):
return (env.Bit('linux') and env.Bit('build_platform_64bit') and
- not env.Bit('host_platform_64bit')
+ not env.Bit('host_platform_64bit') and
+ not env.Bit('host_platform_mipsel')
)
