From 999290fe521700d0ac25334ff860d933ed38d220 Mon Sep 17 00:00:00 2001 From: whitequark Date: Sat, 1 Oct 2016 06:50:16 +0000 Subject: [PATCH] runtime: link ksupport with libm, not runtime. We need libm for the %g format specifier. --- artiq/runtime/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/runtime/Makefile b/artiq/runtime/Makefile index a29982ecf..1068a1db9 100644 --- a/artiq/runtime/Makefile +++ b/artiq/runtime/Makefile @@ -36,11 +36,10 @@ runtime.elf: $(OBJECTS) libruntime.a $(OBJECTS) \ -L../libcompiler-rt \ -L../libbase \ - -L../libm \ -L../liballoc \ -L../liblwip \ -Lcargo/or1k-unknown-none/debug/ \ - -lruntime -lbase -lm -lcompiler-rt -lalloc -llwip + -lruntime -lbase-nofloat -lcompiler-rt -lalloc -llwip @chmod -x $@ ksupport.elf: $(OBJECTS_KSUPPORT) @@ -51,10 +50,11 @@ ksupport.elf: $(OBJECTS_KSUPPORT) ../libbase/crt0-$(CPU).o \ $^ \ -L../libbase \ + -L../libm \ -L../libcompiler-rt \ -L../libunwind \ -L../libdyld \ - -lbase-nofloat -lcompiler-rt -ldyld -lunwind + -lbase -lm -lcompiler-rt -ldyld -lunwind @chmod -x $@ ksupport_data.o: ksupport.elf