diff options
author | Sven Luther <sven.luther@wanadoo.fr> | 2005-06-21 20:15:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 21:46:26 -0400 |
commit | 723e2b35e43dcbcfd737c40453caa7d198092d23 (patch) | |
tree | 3597339cd7e54aebe0e950ddee3f6cf3cdbf2071 /arch/ppc64 | |
parent | 20cee16ced631f70a62c97bdebae08a1c9470448 (diff) |
[PATCH] ppc64: override command line AS/LD/CC variables when adding -m64 and co for biarch compilers
The following kind of calls currently fails :
make ARCH=ppc64 CC="gcc-3.4"
Since the code for detecting a biarch compiler and adding the needed 64bit
magic argument fails if the AS/LD/CC commands are overriden in the command
line.
The attached patch fixes this by using the make override and += directive,
but i am not 100% sure this will work without gmake, as i am no Makefile
expert.
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc64')
-rw-r--r-- | arch/ppc64/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile index 691f3008e698..33c752ceca4b 100644 --- a/arch/ppc64/Makefile +++ b/arch/ppc64/Makefile | |||
@@ -35,9 +35,9 @@ CROSS32AS := $(AS) -a32 | |||
35 | CROSS32LD := $(LD) -m elf32ppc | 35 | CROSS32LD := $(LD) -m elf32ppc |
36 | CROSS32OBJCOPY := $(OBJCOPY) | 36 | CROSS32OBJCOPY := $(OBJCOPY) |
37 | endif | 37 | endif |
38 | AS := $(AS) -a64 | 38 | override AS += -a64 |
39 | LD := $(LD) -m elf64ppc | 39 | override LD += -m elf64ppc |
40 | CC := $(CC) -m64 | 40 | override CC += -m64 |
41 | endif | 41 | endif |
42 | 42 | ||
43 | export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY | 43 | export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY |