diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
| commit | 32a82e38679501da738199135b35f93ddc8aca0a (patch) | |
| tree | ed280e079a8bab790b3dba5f62f1d300ada7540b /toolchain/gcc | |
| parent | 90d5c8b73e8d538e121275b12e714332ca785cff (diff) | |
| parent | 86c05906d3e804b41b9280c226a3a07f6fad5f27 (diff) | |
resolve conflicts
Diffstat (limited to 'toolchain/gcc')
| -rw-r--r-- | toolchain/gcc/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index deef63a5c..ff8c3d509 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -42,6 +42,8 @@ endif ifeq ($(ADK_LINUX_X86_64),y) ifeq ($(ADK_x32),y) GCC_CONFOPTS+= --with-multilib-list=mx32 +else +GCC_CONFOPTS+= --disable-biarch --disable-multilib endif endif |