Skip to content

Commit 9f0fb6e

Browse files
committed
Respect user's LDFLAGS
1 parent 63f1418 commit 9f0fb6e

File tree

8 files changed

+12
-45
lines changed

8 files changed

+12
-45
lines changed

Diff for: Makefile.generic

-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
11
COPT = -Wall -O2 # -DGEMMTEST
2-
ifdef BINARY64
3-
else
4-
# LDFLAGS = -m elf32ppc
5-
LDFLAGS = -m elf_i386
6-
endif

Diff for: Makefile.power

-11
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@ endif
1717
endif
1818

1919
ifdef BINARY64
20-
ifeq ($(OSNAME), Linux)
21-
LDFLAGS = -m elf64ppc
22-
endif
2320

24-
ifeq ($(OSNAME), Darwin)
25-
LDFLAGS = -arch ppc64
26-
endif
2721

2822
ifeq ($(OSNAME), AIX)
2923
CCOMMON_OPT += -mpowerpc64 -maix64
@@ -34,17 +28,12 @@ ifeq ($(COMPILER_F77), xlf)
3428
FCOMMON_OPT += -q64
3529
endif
3630
ARFLAGS = -X 64
37-
LDFLAGS = -b64
3831
ASFLAGS = -a64
3932
endif
4033
else
41-
ifeq ($(OSNAME), Linux)
42-
LDFLAGS = -m elf32ppc
43-
endif
4434
ifeq ($(OSNAME), AIX)
4535
CCOMMON_OPT += -Wa,-a32
4636
ARFLAGS = -X 32
47-
LDFLAGS = -b32
4837
ASFLAGS = -a32
4938
endif
5039
endif

Diff for: Makefile.sparc

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ endif
1010
ifeq ($(COMPILER_F77), f90)
1111
FCOMMON_OPT += -xarch=v9
1212
endif
13-
LDFLAGS = -64
1413
else
1514

1615
CCOMMON_OPT += -mcpu=v9

Diff for: Makefile.x86

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# COMPILER_PREFIX = mingw32-
22

3-
ifeq ($(OSNAME), Linux)
4-
LDFLAGS = -melf_i386
5-
endif
63

74
ifeq ($(OSNAME), Interix)
85
ARFLAGS = -m x86

Diff for: Makefile.x86_64

-13
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,12 @@
22

33
ifeq ($(OSNAME), SunOS)
44
ifdef BINARY64
5-
LDFLAGS = -64
65
ifeq ($(F_COMPILER), SUN)
76
FCOMMON_OPT += -m64
87
endif
98
endif
109
endif
1110

12-
ifeq ($(OSNAME), FreeBSD)
13-
LDFLAGS = -m elf_x86_64_fbsd
14-
endif
15-
16-
ifeq ($(OSNAME), Linux)
17-
LDFLAGS = -m elf_x86_64
18-
endif
19-
20-
ifeq ($(OSNAME), Darwin)
21-
LDFLAGS =
22-
endif
23-
2411
ifeq ($(OSNAME), Interix)
2512
ARFLAGS = -m x64
2613
endif

Diff for: ctest/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ endif
7777
clean ::
7878
rm -f x*
7979

80-
FLDFLAGS = $(FFLAGS:-fPIC=)
80+
FLDFLAGS = $(FFLAGS:-fPIC=) $(LDFLAGS)
8181
CEXTRALIB =
8282

8383
# Single real

Diff for: exports/Makefile

+10-10
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ else
8989
endif
9090

9191
libgoto2_shared.dll : ../$(LIBNAME) libgoto2_shared.def
92-
$(CC) $(CFLAGS) libgoto2_shared.def -shared -o $(@F) \
92+
$(CC) $(LDFLAGS) libgoto2_shared.def -shared -o $(@F) \
9393
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
9494
-Wl,--out-implib,libgoto2_shared.lib $(FEXTRALIB)
9595

@@ -116,14 +116,14 @@ ifeq ($(OSNAME), Linux)
116116
so : ../$(LIBSONAME)
117117

118118
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
119-
$(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \
119+
$(CC) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
120120
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
121121
-Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
122122
ifneq ($(C_COMPILER), LSB)
123-
$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
123+
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
124124
else
125125
#Use FC on LSB
126-
$(FC) $(FFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
126+
$(FC) $(FFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
127127
endif
128128
rm -f linktest
129129

@@ -135,10 +135,10 @@ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
135135
so : ../$(LIBSONAME)
136136

137137
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
138-
$(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \
138+
$(CC) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
139139
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
140140
-Wl,--retain-symbols-file=linux.def $(FEXTRALIB) $(EXTRALIB)
141-
$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
141+
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
142142
rm -f linktest
143143

144144
endif
@@ -148,15 +148,15 @@ ifeq ($(OSNAME), OSF1)
148148
so : ../$(LIBSONAME)
149149

150150
../$(LIBSONAME) :
151-
$(CC) -shared -o ../$(LIBSONAME) ../$(LIBNAME)
151+
$(CC) $(LDFLAGS) -shared -o ../$(LIBSONAME) ../$(LIBNAME)
152152
endif
153153

154154
ifeq ($(OSNAME), SunOS)
155155

156156
so : ../$(LIBSONAME)
157-
$(CC) $(CFLAGS) -shared -o ../$(LIBSONAME) \
157+
$(CC) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
158158
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(EXTRALIB)
159-
$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
159+
$(CC) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
160160
rm -f linktest
161161

162162
endif
@@ -199,7 +199,7 @@ symbol.S : gensymbol
199199
perl ./gensymbol win2kasm noarch dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) > symbol.S
200200

201201
test : linktest.c
202-
$(CC) $(CFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) -lm && echo OK.
202+
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) -lm && echo OK.
203203
rm -f linktest
204204

205205
linktest.c : gensymbol ../Makefile.system ../getarch.c

Diff for: test/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ else
8888
endif
8989
endif
9090

91-
FLDFLAGS = $(FFLAGS:-fPIC=)
91+
FLDFLAGS = $(FFLAGS:-fPIC=) $(LDFLAGS)
9292
CEXTRALIB =
9393

9494

0 commit comments

Comments
 (0)