diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 6 | ||||
| -rw-r--r-- | elf/rtld-Rules | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/elf/Makefile b/elf/Makefile index eef3cb8a64..9e07073de0 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -97,7 +97,6 @@ install-others += $(inst_auditdir)/sotruss-lib.so install-bin-script += sotruss generated += sotruss libof-sotruss-lib = extramodules -CPPFLAGS-sotruss-lib = -DNOT_IN_libc $(objpfx)sotruss-lib.so: $(objpfx)sotruss-lib.os $(build-module-asneeded) $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ @@ -437,15 +436,12 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' -DNOT_IN_libc + -D'SLIBDIR="$(slibdir)"' libof-ldconfig = ldconfig CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS) CFLAGS-rtld.c = $(SYSCONF-FLAGS) -CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ - -DNOT_IN_libc=1) - cpp-srcs-left := $(all-rtld-routines:=.os) lib := rtld include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) diff --git a/elf/rtld-Rules b/elf/rtld-Rules index 65d147f6c4..3c1a5ea749 100644 --- a/elf/rtld-Rules +++ b/elf/rtld-Rules @@ -138,12 +138,10 @@ ifdef rtld-depfiles -include $(rtld-depfiles) endif +# This here is the whole point of all the shenanigans. # Set libof-* for each routine. cpp-srcs-left := $(rtld-modules:%.os=%) lib := rtld include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) -# This here is the whole point of all the shenanigans. -rtld-CPPFLAGS := -DNOT_IN_libc=1 - endif |