Respect user's LDFLAGS
This commit is contained in:
parent
63f14189e3
commit
9f0fb6e662
|
@ -1,6 +1 @@
|
||||||
COPT = -Wall -O2 # -DGEMMTEST
|
COPT = -Wall -O2 # -DGEMMTEST
|
||||||
ifdef BINARY64
|
|
||||||
else
|
|
||||||
# LDFLAGS = -m elf32ppc
|
|
||||||
LDFLAGS = -m elf_i386
|
|
||||||
endif
|
|
||||||
|
|
|
@ -17,13 +17,7 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef BINARY64
|
ifdef BINARY64
|
||||||
ifeq ($(OSNAME), Linux)
|
|
||||||
LDFLAGS = -m elf64ppc
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OSNAME), Darwin)
|
|
||||||
LDFLAGS = -arch ppc64
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OSNAME), AIX)
|
ifeq ($(OSNAME), AIX)
|
||||||
CCOMMON_OPT += -mpowerpc64 -maix64
|
CCOMMON_OPT += -mpowerpc64 -maix64
|
||||||
|
@ -34,17 +28,12 @@ ifeq ($(COMPILER_F77), xlf)
|
||||||
FCOMMON_OPT += -q64
|
FCOMMON_OPT += -q64
|
||||||
endif
|
endif
|
||||||
ARFLAGS = -X 64
|
ARFLAGS = -X 64
|
||||||
LDFLAGS = -b64
|
|
||||||
ASFLAGS = -a64
|
ASFLAGS = -a64
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
ifeq ($(OSNAME), Linux)
|
|
||||||
LDFLAGS = -m elf32ppc
|
|
||||||
endif
|
|
||||||
ifeq ($(OSNAME), AIX)
|
ifeq ($(OSNAME), AIX)
|
||||||
CCOMMON_OPT += -Wa,-a32
|
CCOMMON_OPT += -Wa,-a32
|
||||||
ARFLAGS = -X 32
|
ARFLAGS = -X 32
|
||||||
LDFLAGS = -b32
|
|
||||||
ASFLAGS = -a32
|
ASFLAGS = -a32
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -10,7 +10,6 @@ endif
|
||||||
ifeq ($(COMPILER_F77), f90)
|
ifeq ($(COMPILER_F77), f90)
|
||||||
FCOMMON_OPT += -xarch=v9
|
FCOMMON_OPT += -xarch=v9
|
||||||
endif
|
endif
|
||||||
LDFLAGS = -64
|
|
||||||
else
|
else
|
||||||
|
|
||||||
CCOMMON_OPT += -mcpu=v9
|
CCOMMON_OPT += -mcpu=v9
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
# COMPILER_PREFIX = mingw32-
|
# COMPILER_PREFIX = mingw32-
|
||||||
|
|
||||||
ifeq ($(OSNAME), Linux)
|
|
||||||
LDFLAGS = -melf_i386
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OSNAME), Interix)
|
ifeq ($(OSNAME), Interix)
|
||||||
ARFLAGS = -m x86
|
ARFLAGS = -m x86
|
||||||
|
|
|
@ -2,25 +2,12 @@
|
||||||
|
|
||||||
ifeq ($(OSNAME), SunOS)
|
ifeq ($(OSNAME), SunOS)
|
||||||
ifdef BINARY64
|
ifdef BINARY64
|
||||||
LDFLAGS = -64
|
|
||||||
ifeq ($(F_COMPILER), SUN)
|
ifeq ($(F_COMPILER), SUN)
|
||||||
FCOMMON_OPT += -m64
|
FCOMMON_OPT += -m64
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OSNAME), FreeBSD)
|
|
||||||
LDFLAGS = -m elf_x86_64_fbsd
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OSNAME), Linux)
|
|
||||||
LDFLAGS = -m elf_x86_64
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OSNAME), Darwin)
|
|
||||||
LDFLAGS =
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OSNAME), Interix)
|
ifeq ($(OSNAME), Interix)
|
||||||
ARFLAGS = -m x64
|
ARFLAGS = -m x64
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -77,7 +77,7 @@ endif
|
||||||
clean ::
|
clean ::
|
||||||
rm -f x*
|
rm -f x*
|
||||||
|
|
||||||
FLDFLAGS = $(FFLAGS:-fPIC=)
|
FLDFLAGS = $(FFLAGS:-fPIC=) $(LDFLAGS)
|
||||||
CEXTRALIB =
|
CEXTRALIB =
|
||||||
|
|
||||||
# Single real
|
# Single real
|
||||||
|
|
|
@ -89,7 +89,7 @@ else
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libgoto2_shared.dll : ../$(LIBNAME) libgoto2_shared.def
|
libgoto2_shared.dll : ../$(LIBNAME) libgoto2_shared.def
|
||||||
$(CC) $(CFLAGS) libgoto2_shared.def -shared -o $(@F) \
|
$(CC) $(LDFLAGS) libgoto2_shared.def -shared -o $(@F) \
|
||||||
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
|
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
|
||||||
-Wl,--out-implib,libgoto2_shared.lib $(FEXTRALIB)
|
-Wl,--out-implib,libgoto2_shared.lib $(FEXTRALIB)
|
||||||
|
|
||||||
|
@ -116,14 +116,14 @@ ifeq ($(OSNAME), Linux)
|
||||||
so : ../$(LIBSONAME)
|
so : ../$(LIBSONAME)
|
||||||
|
|
||||||
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
|
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
|
||||||
$(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \
|
$(CC) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
||||||
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
|
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
|
||||||
-Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
|
-Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
|
||||||
ifneq ($(C_COMPILER), LSB)
|
ifneq ($(C_COMPILER), LSB)
|
||||||
$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
||||||
else
|
else
|
||||||
#Use FC on LSB
|
#Use FC on LSB
|
||||||
$(FC) $(FFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
$(FC) $(FFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
||||||
endif
|
endif
|
||||||
rm -f linktest
|
rm -f linktest
|
||||||
|
|
||||||
|
@ -135,10 +135,10 @@ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
|
||||||
so : ../$(LIBSONAME)
|
so : ../$(LIBSONAME)
|
||||||
|
|
||||||
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
|
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
|
||||||
$(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \
|
$(CC) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
||||||
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
|
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
|
||||||
-Wl,--retain-symbols-file=linux.def $(FEXTRALIB) $(EXTRALIB)
|
-Wl,--retain-symbols-file=linux.def $(FEXTRALIB) $(EXTRALIB)
|
||||||
$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
||||||
rm -f linktest
|
rm -f linktest
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -148,15 +148,15 @@ ifeq ($(OSNAME), OSF1)
|
||||||
so : ../$(LIBSONAME)
|
so : ../$(LIBSONAME)
|
||||||
|
|
||||||
../$(LIBSONAME) :
|
../$(LIBSONAME) :
|
||||||
$(CC) -shared -o ../$(LIBSONAME) ../$(LIBNAME)
|
$(CC) $(LDFLAGS) -shared -o ../$(LIBSONAME) ../$(LIBNAME)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OSNAME), SunOS)
|
ifeq ($(OSNAME), SunOS)
|
||||||
|
|
||||||
so : ../$(LIBSONAME)
|
so : ../$(LIBSONAME)
|
||||||
$(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \
|
$(CC) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
||||||
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB)
|
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB)
|
||||||
$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
$(CC) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
||||||
rm -f linktest
|
rm -f linktest
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -199,7 +199,7 @@ symbol.S : gensymbol
|
||||||
perl ./gensymbol win2kasm noarch dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) > symbol.S
|
perl ./gensymbol win2kasm noarch dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) > symbol.S
|
||||||
|
|
||||||
test : linktest.c
|
test : linktest.c
|
||||||
$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) -lm && echo OK.
|
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) -lm && echo OK.
|
||||||
rm -f linktest
|
rm -f linktest
|
||||||
|
|
||||||
linktest.c : gensymbol ../Makefile.system ../getarch.c
|
linktest.c : gensymbol ../Makefile.system ../getarch.c
|
||||||
|
|
|
@ -88,7 +88,7 @@ else
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
FLDFLAGS = $(FFLAGS:-fPIC=)
|
FLDFLAGS = $(FFLAGS:-fPIC=) $(LDFLAGS)
|
||||||
CEXTRALIB =
|
CEXTRALIB =
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue