diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2001-01-06 06:16:31 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2001-01-06 06:16:31 +0000 |
| commit | 3f6014e672836eb14364a252129c5affe2f7020c (patch) | |
| tree | e9870f2b5525300a8afad2d727919c91c9af3ca8 /gnu/lib | |
| parent | cad1dd7bb48ce31f7da38885f47db0af6cae5bc5 (diff) | |
Notes
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/Makefile | 2 | ||||
| -rw-r--r-- | gnu/lib/libgcc/Makefile | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 7be57b174ab0..41f323674005 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -2,9 +2,11 @@ SUBDIR= csu libdialog libgcc libgmp libmp libregex libreadline +.if ${OBJFORMAT} == aout .if !defined(NOLIBC_R) SUBDIR+= libgcc_r .endif +.endif .if !defined(NO_CXX) SUBDIR+= libstdc++ diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index a9842a08a2ce..a16558ac4b2f 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -4,12 +4,15 @@ GCCDIR= ${.CURDIR}/../../../contrib/gcc.295 .PATH: ${GCCDIR}/cp ${GCCDIR} +# allow to be overridden for the a.out case .if !defined(LIB) || ${LIB} != "gcc_r" LIB= gcc .endif +.if ${OBJFORMAT} == aout # Install libgcc_pic.a, since ld.so uses it. INSTALL_PIC_ARCHIVE= yes +.endif # # XXX This is a hack, but it seems to work. libgcc1.a is supposed to be @@ -59,6 +62,10 @@ SRCS= frame.c tinfo.cc tinfo2.cc new.cc exception.cc CFLAGS+= -I${GCCDIR}/config -I${GCCDIR} -I. CFLAGS+= -fexceptions CFLAGS+= -DIN_GCC +.if ${OBJFORMAT} != aout +#CFLAGS+= -D_PTHREADS -fPIC -DGTHREAD_USE_WEAK +CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK +.endif CXXFLAGS+= -I${GCCDIR}/cp/inc CXXFLAGS+= -nostdinc++ |