X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2FMakefile;fp=db-mysql%2FMakefile;h=de42b71c529f37c4c0eddf1e8b0082c6e4b8f4db;hp=d67afe1bacb61986ce02931541b0d7f777f08a18;hb=8ba880a396dfe787a9aefddc1c011ac2bc8e244a;hpb=f67c4e2a4e5b8371a1b7c1629828999ff909f538 diff --git a/db-mysql/Makefile b/db-mysql/Makefile index d67afe1..de42b71 100644 --- a/db-mysql/Makefile +++ b/db-mysql/Makefile @@ -30,7 +30,7 @@ CFLAGS:=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql - LDFLAGS:=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/opt/local/lib/mysql5/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc CFLAGS32:=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include -m32 -LDFLAGS32:=-L/lib32 -L/usr/lib32 -melf_i386 -lmysqlclient -lz -lc +LDFLAGS32:=-L/lib32 -L/usr/lib32 -lmysqlclient -lz -lc ifneq ($(OS_CYGWIN),0) CFLAGS:=-I /cygdrive/c/Program\ Files/MySQL/MySQL\ Server\ 5.0/include @@ -64,14 +64,14 @@ else else ifneq ($(OS_LINUX64),0) gcc $(CFLAGS) -fPIC -c $(source) -o $(object) - ld $(LDFLAGS) -shared -soname=$(base) $(object) -o $(shared64_lib) + gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) -o $(shared64_lib) rm $(object) @echo "Ensure that you have multiarch i386 build tools and libraries if you want to build 32-bit library" -gcc $(CFLAGS32) -fPIC -c $(source) -o $(object) - -ld -shared -soname=$(base) $(object) $(LDFLAGS32) -o $(shared_lib) + -gcc $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) $(LDFLAGS32) -o $(shared_lib) else gcc $(CFLAGS) -fPIC -c $(source) -o $(object) - ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib) + gcc -m32 $(LDFLAGS) -fPIC -shared -Wl,-soname=$(base) -lc $(object) $(LDFLAGS) -o $(shared_lib) endif endif endif