diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sunrpc/Makefile | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 0e992cb810..7db579c153 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-10 Andreas Schwab <schwab@linux-m68k.org> + + * sunrpc/Makefile (extra-objs) [$(build-shared) = yes]: Add + $(addsuffix .os,$(rpc-compat-routines)). Move include ../Rules + after this. + 2012-05-09 H.J. Lu <hongjiu.lu@intel.com> * stdlib/longlong.h: Updated from GCC. diff --git a/sunrpc/Makefile b/sunrpc/Makefile index 48790f4da9..b4548d5ccd 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -107,12 +107,16 @@ librpcsvc-inhibit-o = .os # Build no shared rpcsvc library. omit-deps = $(librpcsvc-routines) endif -include ../Rules - ifeq (yes,$(build-shared)) rpc-compat-routines = $(addprefix compat-,$(need-export-routines)) rpc-compat-routines.os = $(addprefix $(objpfx), \ $(addsuffix .os,$(rpc-compat-routines))) +extra-objs += $(addsuffix .os,$(rpc-compat-routines)) +endif + +include ../Rules + +ifeq (yes,$(build-shared)) subdir_lib: $(objpfx)librpc_compat_pic.a $(objpfx)librpc_compat_pic.a: $(rpc-compat-routines.os) $(AR) cr$(verbose) $@ $^ |