Skip to content

Commit 1e1250b

Browse files
committed
Fixed #260. Fixed generating 32-bit shared library on previous commit.
1 parent e6ebbfd commit 1e1250b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

exports/Makefile

Lines changed: 6 additions & 6 deletions
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) $(LDFLAGS) libgoto2_shared.def -shared -o $(@F) \
92+
$(CC) $(CFLAGS) $(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,7 +116,7 @@ ifeq ($(OSNAME), Linux)
116116
so : ../$(LIBSONAME)
117117

118118
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
119-
$(CC) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
119+
$(CC) $(CFLAGS) $(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)
@@ -135,7 +135,7 @@ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
135135
so : ../$(LIBSONAME)
136136

137137
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
138-
$(CC) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
138+
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
139139
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
140140
-Wl,--retain-symbols-file=linux.def $(FEXTRALIB) $(EXTRALIB)
141141
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
@@ -148,15 +148,15 @@ ifeq ($(OSNAME), OSF1)
148148
so : ../$(LIBSONAME)
149149

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

154154
ifeq ($(OSNAME), SunOS)
155155

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

162162
endif

0 commit comments

Comments
 (0)