e161b07644dec9d57640bc20d0256598e0caf5c9

Some linker don't understand inherited links

Signed-off-by: Michel Pollet <buserror@gmail.com>

diff --git a/Makefile.common b/Makefile.common
index f781c1640b0a226e0e89981dd17407b614f9111e..d476d8366fb613faaa941207d748b32160bc1510 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -35,7 +35,6 @@ endif
 
 CFLAGS         += -g --std=gnu99 -Wall
 CFLAGS         += ${patsubst %,-I%,${subst :, ,${IPATH}}}
-LDFLAGS        += -lelf 
 
 ifeq (${shell uname}, Darwin)
 AVR_ROOT       := "/Applications/Arduino.app/Contents/Resources/Java/hardware/tools/avr/"
@@ -62,6 +61,8 @@ OBJ           = obj-${shell $(CC) -dumpmachine}
 LIBDIR         = ${shell pwd}/${SIMAVR}/${OBJ}
 LDFLAGS        += -L${LIBDIR} -lsimavr 
 
+LDFLAGS        += -lelf 
+
 ifeq (${shell uname}, Linux)
 # allow the shared library to be found in the build directory
 LFLAGS         += -Wl,-rpath,${LIBDIR}

diff --git a/simavr/simavr.pc b/simavr/simavr.pc
index 87607fb40aa6855c65239430c59b677b67b48506..c1e9ba9d329032919451e49eb6c98fbd8fc4ec8b 100644 (file)
--- a/simavr/simavr.pc
+++ b/simavr/simavr.pc
@@ -8,7 +8,7 @@ Name: simavr
 Description: Atmel(tm) AVR 8 bits simulator
 Version: VERSION
 Cflags: -I${includedir}
-Libs: -L${libdir} -lsimavr
+Libs: -L${libdir} -lsimavr -lelf
 
 simavr-avr.pc:
 prefix=PREFIX
@@ -22,5 +22,5 @@ Version: VERSION
 Cflags: -I${includedir}/avr -ffunction-sections -fdata-sections \
                        -Wl,--relax,--gc-sections \
                        -Wl,--undefined=_mmcu,--section-start=.mmcu=0x910000
-Libs: -L${libdir} -lsimavr
+Libs: