King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- Compile libs of test/SingletonDll with -fPIC, fixes FTBFS on amd64

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@775 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
lfittl 2006-11-05 13:09:00 +00:00
parent 92daa47cbd
commit f3aa021c9a
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
test/SingletonDll/Makefile
View file

@ -3,12 +3,12 @@ include ../Makefile.common
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
LIB1 := libfoo.dylib LIB1 := libfoo.dylib
LIB2 := libsingletondll.dylib LIB2 := libsingletondll.dylib
SHARED_LIB_FLAG := -dynamiclib SHARED_LIB_FLAG := -dynamiclib -fPIC
else else
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
LIB1 := libfoo.so LIB1 := libfoo.so
LIB2 := libsingletondll.so LIB2 := libsingletondll.so
SHARED_LIB_FLAG := --shared SHARED_LIB_FLAG := --shared -fPIC
else else
LIB1 := foo.dll LIB1 := foo.dll
LIB2 := singletondll.dll LIB2 := singletondll.dll
@ -20,14 +20,17 @@ BIN1 := client$(BIN_SUFFIX)
SRC1 := client.cpp SRC1 := client.cpp
OBJ1 := $(SRC1:.cpp=.o) OBJ1 := $(SRC1:.cpp=.o)
SRC2 := foo.cpp SRC2 := foo.cpp
OBJ2 := $(SRC2:.cpp=.o) OBJ2 := $(SRC2:.cpp=.lo)
SRC3 := singletondll.cpp SRC3 := singletondll.cpp
OBJ3 := $(SRC3:.cpp=.o) OBJ3 := $(SRC3:.cpp=.lo)
override LDFLAGS := -L../../lib override LDFLAGS := -L../../lib
.PHONY: all clean .PHONY: all clean
all: $(BIN1) all: $(BIN1)
%.lo : %.cpp
$(CXX) -c $(CXXFLAGS) -fPIC $(CPPFLAGS) -o $@ $<
$(BIN1): $(OBJ1) $(LIB1) $(LIB2) $(BIN1): $(OBJ1) $(LIB1) $(LIB2)
$(CXX) -L. $(LDFLAGS) -o $@ $(OBJ1) $(LDLIBS) -lfoo -lsingletondll $(CXX) -L. $(LDFLAGS) -o $@ $(OBJ1) $(LDLIBS) -lfoo -lsingletondll