diff options
| author | Thomas Schwinge <tschwinge@gnu.org> | 2007-02-19 22:30:48 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:27:05 +0200 |
| commit | bad9f4c53148a65138128ad8683d689535eca878 (patch) | |
| tree | 48b2d06db4adc3fd74f7ef4afa511e7ed4d9c9c5 /Makefile.am | |
| parent | 45268d3812e359e15cb1b4dacbe86e985e5ba305 (diff) | |
2007-02-19 Thomas Schwinge <tschwinge@gnu.org>
* Makefile.am (gnumach_LINKFLAGS): New variable.
(gnumach_LINK): Use that one instead of the previously used
`LINKFLAGS_gnumach'.
* i386/Makefrag.am (LINKFLAGS_gnumach): Rename to `gnumach_LINKFLAGS',
move into [PLATFORM_at] and pass `_START'.
* i386/ldscript: Don't hardcode a _start address of 0x100000, but make
it configurable via `_START'.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index baa5ecf8..6bca83a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,9 +94,11 @@ nodist_libkernel_a_SOURCES = MOSTLYCLEANFILES += \ $(nodist_libkernel_a_SOURCES) -gnumach_o_LDADD = -gnumach_o_LDADD += \ +gnumach_o_LDADD = \ libkernel.a + +gnumach_SOURCES = +gnumach_LINKFLAGS = # Makerules: how to do some things. include Makerules.am @@ -140,8 +142,7 @@ clib-routines.o: gnumach-undef gnumach-undef-bad $(CCLD) -nostdlib -nostartfiles -r -static \ -o $@ `sed 's/^/-Wl,-u,/' < $<` -x c /dev/null -lc -gnumach_SOURCES = -gnumach_LINK = $(LD) $(LINKFLAGS) $(LINKFLAGS_$@) -o $@ +gnumach_LINK = $(LD) $(LINKFLAGS) $(gnumach_LINKFLAGS) -o $@ gnumach_LDADD = gnumach.o clib-routines.o # |