diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2010-06-28 07:38:12 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2013-10-29 16:30:53 +0100 |
commit | 51ed148847f1d6549b4f12878dda5aac121083d1 (patch) | |
tree | 967e71e65746a6a77e3b218d9d7b83e979aa8af4 | |
parent | 0216c00c386a5a53503fdb97c0bc05f068477ce2 (diff) | |
download | dev86-51ed148847f1d6549b4f12878dda5aac121083d1.tar.gz |
Link compile helpers separately
-rw-r--r-- | libc/Makefile | 6 | ||||
-rw-r--r-- | makefile.in | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libc/Makefile b/libc/Makefile index 481c034..f7df72d 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -9,6 +9,7 @@ else TOP=$(TOPDIR)/libc endif +LIBBCC=$(TOP)/libbcc.a CC=bcc CCFLAGS=-I -I$(TOP)/include DEFS=-D__LIBC__ @@ -30,7 +31,7 @@ MAKEPASS= \ DEFS='$(DEFS)' LIB_CPU='$(LIB_CPU)' LIB_OS='$(LIB_OS)' \ -all: $(OBJ) $(LIBC) +all: $(OBJ) $(LIBC) $(LIBBCC) @: $(LIBC): transfer .config.dir @@ -38,6 +39,9 @@ $(LIBC): transfer .config.dir $(MAKE) $(MAKEPASS) -C $$i all || exit 1 ; \ done +$(LIBBCC): .config.dir + $(MAKE) $(MAKEPASS) LIBC=$(LIBBCC) -C bcc all + crt3.o: crt0.c Makefile $(CC) -c $(CFLAGS) -D__LIBC_VER__='"$(VERSION)"' -o $@ crt0.c diff --git a/makefile.in b/makefile.in index 48698b3..b586da1 100644 --- a/makefile.in +++ b/makefile.in @@ -243,6 +243,7 @@ install-lib: lib/lib0-done lib/lib2-done lib/lib1-done install $(INDAT) lib/libc_s.a $(DISTLIB)/libc_s.a install $(INDAT) lib/libbsd.a $(DISTLIB)/libbsd.a install $(INDAT) lib/libdos.a $(DISTLIB)/libdos.a + install $(INDAT) lib/libbcc.a $(DISTLIB)/libbcc.a #ifndef __AS386_16__ install -d $(DISTLIB)/i386 install $(INDAT) lib/i386/crt0.o $(DISTLIB)/i386/crt0.o @@ -264,7 +265,7 @@ all-libs: library lib-bsd alt-libs library: bindir test -f bin/ncc $(MAKEC) libc $(LIBARGS) PLATFORM=i86-ELKS - cp -p libc/crt0.o libc/libc.a lib/. + cp -p libc/crt0.o libc/libc.a libc/libbcc.a lib/. sh libcompat lib/libc.a @touch lib/lib0-done |