9os

commit c64919fd78a5f0d13f8171898f7bed547444b95c
parent 16c3d05de51e2e2fa5ded5e2281213249b264830
Author: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date:   Thu, 13 Dec 2018 10:42:33 +0000

Introduce RANLIB variable

Change-Id: I5a53d6c92db5b313eaba9ad578827ef0fd5ec796
Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com>

Diffstat:
M
config/amd64-darwin-clang.mk
 | 
1
+
M
config/amd64-dragonfly.mk
 | 
1
+
M
config/amd64-linux-clang.mk
 | 
1
+
M
config/amd64-linux-pcc.mk
 | 
1
+
M
config/amd64-linux.mk
 | 
1
+
M
config/amd64-netbsd.mk
 | 
1
+
M
config/amd64-openbsd.mk
 | 
1
+
M
config/arm32-linux.mk
 | 
1
+
M
config/arm64-linux.mk
 | 
1
+
M
config/rmode-rcode-armclang.mk
 | 
1
+
M
config/rmode-rcode-clang.mk
 | 
1
+
M
config/rmode-rcode.mk
 | 
1
+
M
scripts/rules.mk
 | 
1
+
M
src/libc/Makefile
 | 
2
+-
M
src/libhdl/Makefile
 | 
2
+-
M
src/libk/Makefile
 | 
2
+-
M
src/librmu/Makefile
 | 
2
+-
M
src/libtypes/Makefile
 | 
2
+-
M
test/unit/001/Makefile
 | 
2
+-

19 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/config/amd64-darwin-clang.mk b/config/amd64-darwin-clang.mk
@@ -10,3 +10,4 @@ COMP = clang
 ASM = clang
 LINKER = ld
 OBJDUMP = objdump
+RANLIB = ranlib
diff --git a/config/amd64-dragonfly.mk b/config/amd64-dragonfly.mk
@@ -8,3 +8,4 @@ COMP = gcc
 ASM = as
 LINKER = ld
 OBJDUMP = objdump
+RANLIB = ranlib
diff --git a/config/amd64-linux-clang.mk b/config/amd64-linux-clang.mk
@@ -9,3 +9,4 @@ COMP = clang
 ASM = clang
 LINKER = ld.lld
 OBJDUMP = llvm-objdump
+RANLIB = ranlib
diff --git a/config/amd64-linux-pcc.mk b/config/amd64-linux-pcc.mk
@@ -8,3 +8,4 @@ COMP = pcc
 ASM = as
 LINKER = ld
 OBJDUMP = objdump
+RANLIB = ranlib
diff --git a/config/amd64-linux.mk b/config/amd64-linux.mk
@@ -8,3 +8,4 @@ COMP = gcc
 ASM = as
 LINKER = ld
 OBJDUMP = objdump
+RANLIB = ranlib
diff --git a/config/amd64-netbsd.mk b/config/amd64-netbsd.mk
@@ -8,3 +8,4 @@ COMP = gcc
 ASM = as
 LINKER = ld
 OBJDUMP = objdump
+RANLIB = ranlib
diff --git a/config/amd64-openbsd.mk b/config/amd64-openbsd.mk
@@ -8,3 +8,4 @@ COMP = gcc
 ASM = as
 LINKER = ld
 OBJDUMP = objdump
+RANLIB = ranlib
diff --git a/config/arm32-linux.mk b/config/arm32-linux.mk
@@ -17,3 +17,4 @@ ASM = as
 LINKER = ld
 EMU = qemu-arm-static
 OBJDUMP = objdump
+RANLIB = ranlib
diff --git a/config/arm64-linux.mk b/config/arm64-linux.mk
@@ -9,3 +9,4 @@ ASM = as
 LINKER = ld
 EMU = qemu-aarch64-static
 OBJDUMP = objdump
+RANLIB = ranlib
diff --git a/config/rmode-rcode-armclang.mk b/config/rmode-rcode-armclang.mk
@@ -9,3 +9,4 @@ ASM = armclang
 LINKER = ld.lld
 OBJCOPY = llvm-objcopy
 OBJDUMP = llvm-objdump
+RANLIB = ranlib
diff --git a/config/rmode-rcode-clang.mk b/config/rmode-rcode-clang.mk
@@ -9,3 +9,4 @@ ASM = clang
 LINKER = ld.lld
 OBJCOPY = llvm-objcopy
 OBJDUMP = llvm-objdump
+RANLIB = ranlib
diff --git a/config/rmode-rcode.mk b/config/rmode-rcode.mk
@@ -8,3 +8,4 @@ ASM = as
 LINKER = ld
 OBJCOPY = objcopy
 OBJDUMP = objdump
+RANLIB = ranlib
diff --git a/scripts/rules.mk b/scripts/rules.mk
@@ -44,6 +44,7 @@ AS = $(CROSS_COMPILE)$(ASM)
 LD = $(CROSS_COMPILE)$(LINKER)
 OC = $(CROSS_COMPILE)$(OBJCOPY)
 OD = $(CROSS_COMPILE)$(OBJDUMP)
+RL = $(CROSS_COMPILE)$(RANLIB)
 HOSTCC=$(COMP)
 
 FORALL= +@set -e ;\
diff --git a/src/libc/Makefile b/src/libc/Makefile
@@ -23,7 +23,7 @@ objlst: FORCE
 
 $(TARGET): objlst
 	xargs $(AR) $(ARFLAGS) $@ < objlst
-	ranlib $(RANLIBFLAGS) $@
+	$(RL) $(RANLIBFLAGS) $@
 
 clean:
 	$(FORALL)
diff --git a/src/libhdl/Makefile b/src/libhdl/Makefile
@@ -77,4 +77,4 @@ all: $(TARGET)
 
 $(TARGET): $(OBJS)
 	$(AR) $(ARFLAGS) $@ $?
-	ranlib $(RANLIBFLAGS) $@
+	$(RL) $(RANLIBFLAGS) $@
diff --git a/src/libk/Makefile b/src/libk/Makefile
@@ -20,4 +20,4 @@ all: $(TARGET)
 
 $(TARGET): $(OBJS)
 	$(AR) $(ARFLAGS) $@ $?
-	ranlib $(RANLIBFLAGS) $@
+	$(RL) $(RANLIBFLAGS) $@
diff --git a/src/librmu/Makefile b/src/librmu/Makefile
@@ -77,4 +77,4 @@ all: $(TARGET)
 
 $(TARGET): $(OBJS)
 	$(AR) $(ARFLAGS) $@ $?
-	ranlib $(RANLIBFLAGS) $@
+	$(RL) $(RANLIBFLAGS) $@
diff --git a/src/libtypes/Makefile b/src/libtypes/Makefile
@@ -40,7 +40,7 @@ rscb.h: $(JSONDIR)/version
 
 $(TARGET): $(OBJS)
 	$(AR) $(ARFLAGS) $@ $?
-	ranlib $(RANLIBFLAGS) $@
+	$(RL) $(RANLIBFLAGS) $@
 
 clean:
 	rm -f rscb.h
diff --git a/test/unit/001/Makefile b/test/unit/001/Makefile
@@ -97,7 +97,7 @@ ramfw: $(RAMOBJS) $(LIBDEP) libhdl.a
 
 libhdl.a: $(LIBOBJ)
 	$(AR) $(ARFLAGS) $@ $?
-	ranlib $@
+	$(RL) $(RANLIBFLAGS) $@
 
 rmu: 
 	./mkrmu