[LibOS,Pal] Define AR and ARFLAGS properly

LibOS/shim/src/Makefile

@@ -27,7 +27,6 @@ ASFLAGS	= -Wa,--noexecstack -x assembler-with-cpp -I../include
 LDFLAGS	= -shared -nostdlib -z combreloc -z relro -z now -z defs \
 	  -dynamic-link=libpal.so \
 	  -rpath-link=$(abspath $(RUNTIME_DIR))
-ARFLAGS	=
 
 ifeq ($(WERROR),1)
 CFLAGS += -Werror

Pal/lib/Makefile

@@ -6,7 +6,6 @@ CFLAGS	= -Wall -fPIC -O2 -std=gnu99 -fgnu89-inline -U_FORTIFY_SOURCE \
 	  $(call cc-option,-Wnull-dereference) \
 	  -fno-omit-frame-pointer \
 	  -fno-stack-protector -fno-builtin
-ARFLAGS	=
 
 include ../src/host/$(PAL_HOST)/Makefile.am
 

Pal/src/host/Linux-SGX/Makefile.am

@@ -13,7 +13,6 @@ ASFLAGS = -DPIC -DSHARED -fPIC -DASSEMBLER -Wa,--noexecstack \
 LDFLAGS	= -shared -nostdlib -z combreloc -z defs \
 	  --version-script $(HOST_DIR)/pal.map -T $(HOST_DIR)/enclave.lds \
 	  --hash-style=gnu -z relro -z now
-ARFLAGS	=
 
 CRYPTO_PROVIDER = mbedtls
 CFLAGS += -DCRYPTO_USE_MBEDTLS

Pal/src/host/Linux/Makefile.am

@@ -14,7 +14,6 @@ ASFLAGS = -DPIC -DSHARED -fPIC -DASSEMBLER -Wa,--noexecstack \
 LDFLAGS	= -shared -nostdlib -z combreloc -z defs \
 	  --version-script $(HOST_DIR)/pal.map -T $(HOST_DIR)/pal.lds \
 	  -z relro -z now
-ARFLAGS	=
 
 ifeq ($(WERROR),1)
 CFLAGS += -Werror

Pal/src/host/Skeleton/Makefile.am

@@ -11,7 +11,6 @@ ASFLAGS = -DPIC -DSHARED -fPIC -DASSEMBLER -Wa,--noexecstack \
 	  -x assembler-with-cpp
 LDFLAGS = -shared -nostdlib -z combreloc -z defs \
 	  --version-script $(HOST_DIR)/pal.map -T $(HOST_DIR)/pal.lds
-ARFLAGS =
 
 ifeq ($(WERROR),1)
 CFLAGS += -Werror

Scripts/Makefile.configs

@@ -5,7 +5,10 @@ ifeq ($(origin AS),default)
 AS	= gcc
 endif
 ifeq ($(origin AR),default)
-AR	= ar rcs
+AR	= ar
+endif
+ifeq ($(origin ARFLAGS),default)
+ARFLAGS = rcs
 endif
 ifeq ($(origin LD),default)
 LD	= ld

Scripts/Makefile.rules

@@ -97,10 +97,10 @@ quiet_cmd_ld_so_o = [ $@ ]
 
 # AR
 quiet_cmd_ar_so_o = [ $@ ]
-      cmd_ar_so_o = $(AR) $(ARFLAGS) $(ARFLAGS-$@) $@ $^
+      cmd_ar_so_o = $(AR) $(ARFLAGS)$(ARFLAGS-$@) $@ $^
 
 quiet_cmd_ar_a_o = [ $@ ]
-      cmd_ar_a_o = $(AR) $(ARFLAGS) $(ARFLAGS-$@) $@ $^
+      cmd_ar_a_o = $(AR) $(ARFLAGS)$(ARFLAGS-$@) $@ $^
 
 # LD only
 quiet_cmd_ld = [ $@ ]