[sr-dev] git:4.4:d797574e: Makefile.defs: explicit retarget of amd64 arch to x86_64

Module: kamailio Branch: 4.4 Commit: d797574e8f2b152dd2b7f6a1db51724cc4461797 URL: https://github.com/kamailio/kamailio/commit/d797574e8f2b152dd2b7f6a1db51724… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2017-03-15T13:31:35+01:00 Makefile.defs: explicit retarget of amd64 arch to x86_64 - it is supposed to be done by the arch detection scripts, but it may fail on various systems having a different output than expected (cherry picked from commit 2bea7f5a4b2d2ddba9d9a8f050b2ceeb79d2381c) (cherry picked from commit ae2b828b49cd3aaa771a81b4c6b8893d9bad619f) --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d797574e8f2b152dd2b7f6a1db51724… Patch: https://github.com/kamailio/kamailio/commit/d797574e8f2b152dd2b7f6a1db51724… --- diff --git a/Makefile.defs b/Makefile.defs index 4083234..80ebf6ea 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -369,6 +369,12 @@ ARCH:=$(CC_ARCH) else ARCH:=$(HOST_ARCH) endif + +# retarget amd64 to x86_64 +ifeq ($(ARCH), amd64) + ARCH=x86_64 +endif + $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) LIBDIR ?= @@ -783,10 +789,6 @@ ifeq ($(ARCH), x86_64) use_fast_lock=yes endif -ifeq ($(ARCH), amd64) - use_fast_lock=yes -endif - ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) use_fast_lock=yes