Skip to content

Commit b15a19c

Browse files
committed
Makefile.shared: fix to allow strings and spaces in passed variables
The previous change for mingw, which now defaults to OPENSSLDIR and ENGINESDIR definitions that include a space, a long standing issue was revealed again; our builds for Unix like environment were never very tolerant of spaces in these definitions, because the quotes were interpreted along the way. New analysis of Makefile.shared showed that our use of quotes in there wasn't quite right. A lot of double quotes could safely be replaced with single quotes, thus protecting the diverse values we pass down to this build file (remember that make variables are expanded before passing the command to the shell, unconditionally), reserving double quotes to the places where absolutely needed (to protect the expansion of shell variables to commands). CVE-2019-1552 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from #9469)
1 parent e32bc85 commit b15a19c

File tree

1 file changed

+58
-58
lines changed

1 file changed

+58
-58
lines changed

Diff for: Makefile.shared

+58-58
Original file line numberDiff line numberDiff line change
@@ -98,44 +98,44 @@ top:
9898

9999
LINK_APP= \
100100
( $(SET_X); \
101-
LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
102-
LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS) $(LDFLAGS)}"; \
101+
LIBDEPS=$${LIBDEPS:-'$(LIBDEPS)'}; \
102+
LDCMD=$${LDCMD:-'$(CC)'}; LDFLAGS=$${LDFLAGS:-'$(CFLAGS) $(LDFLAGS)'}; \
103103
LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
104104
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
105105
echo LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
106106
$${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS}; \
107107
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
108-
$${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
108+
eval "$${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS}" )
109109

110110
LINK_SO= \
111111
( $(SET_X); \
112-
LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
113-
SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
114-
SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
112+
LIBDEPS=$${LIBDEPS:-'$(LIBDEPS)'}; \
113+
SHAREDCMD=$${SHAREDCMD:-'$(CC)'}; \
114+
SHAREDFLAGS=$${SHAREDFLAGS:-'$(CFLAGS) $(SHARED_LDFLAGS)'}; \
115115
LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
116116
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
117117
echo LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
118118
$${SHAREDCMD} $${SHAREDFLAGS} \
119119
-o $(SHLIBNAME_FULL) \
120120
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS; \
121121
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
122-
$${SHAREDCMD} $${SHAREDFLAGS} \
122+
eval "$${SHAREDCMD} $${SHAREDFLAGS} \
123123
-o $(SHLIBNAME_FULL) \
124-
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
124+
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS" \
125125
) && $(SYMLINK_SO)
126126

127127
SYMLINK_SO= \
128128
if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
129-
if [ -n "$(SHLIBNAME_FULL)" -a -n "$(SHLIBNAME)" -a \
130-
"$(SHLIBNAME_FULL)" != "$(SHLIBNAME)" ]; then \
129+
if [ -n '$(SHLIBNAME_FULL)' -a -n '$(SHLIBNAME)' -a \
130+
'$(SHLIBNAME_FULL)' != '$(SHLIBNAME)' ]; then \
131131
( $(SET_X); \
132132
rm -f $(SHLIBNAME); \
133133
ln -s $(SHLIBNAME_FULL) $(SHLIBNAME) ); \
134134
fi; \
135135
fi
136136

137-
LINK_SO_SHLIB= SHOBJECTS="$(STLIBNAME) $(LIBEXTRAS)"; $(LINK_SO)
138-
LINK_SO_DSO= INHIBIT_SYMLINKS=yes; SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO)
137+
LINK_SO_SHLIB= SHOBJECTS='$(STLIBNAME) $(LIBEXTRAS)'; $(LINK_SO)
138+
LINK_SO_DSO= INHIBIT_SYMLINKS=yes; SHOBJECTS='$(LIBEXTRAS)'; $(LINK_SO)
139139

140140
LINK_SO_SHLIB_VIA_O= \
141141
SHOBJECTS=$(STLIBNAME).o; \
@@ -147,21 +147,21 @@ LINK_SO_SHLIB_VIA_O= \
147147
LINK_SO_SHLIB_UNPACKED= \
148148
UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \
149149
(cd $$UNPACKDIR; ar x ../$(STLIBNAME)) && \
150-
([ -z "$(LIBEXTRAS)" ] || cp $(LIBEXTRAS) $$UNPACKDIR) && \
150+
([ -z '$(LIBEXTRAS)' ] || cp $(LIBEXTRAS) $$UNPACKDIR) && \
151151
SHOBJECTS=$$UNPACKDIR/*.o; \
152152
$(LINK_SO) && rm -rf $$UNPACKDIR
153153

154154
DETECT_GNU_LD=($(CC) -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
155155

156156
DO_GNU_SO_COMMON=\
157-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$(SHLIBNAME_FULL)"
157+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$(SHLIBNAME_FULL)'
158158
DO_GNU_DSO=\
159159
$(DO_GNU_SO_COMMON)
160160
DO_GNU_SO=\
161161
ALLSYMSFLAGS='-Wl,--whole-archive'; \
162162
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
163163
$(DO_GNU_SO_COMMON)
164-
DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS)"
164+
DO_GNU_APP=LDFLAGS='$(CFLAGS) $(LDFLAGS)'
165165

166166
#This is rather special. It's a special target with which one can link
167167
#applications without bothering with any features that have anything to
@@ -186,21 +186,21 @@ link_shlib.linux-shared:
186186

187187
link_dso.bsd:
188188
@if $(DETECT_GNU_LD); then $(DO_GNU_DSO); else \
189-
LIBDEPS=" "; \
189+
LIBDEPS=' '; \
190190
ALLSYMSFLAGS=; \
191191
NOALLSYMSFLAGS=; \
192-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
192+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib'; \
193193
fi; $(LINK_SO_DSO)
194194
link_shlib.bsd:
195195
@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
196-
LIBDEPS=" "; \
197-
ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
196+
LIBDEPS=' '; \
197+
ALLSYMSFLAGS='-Wl,-Bforcearchive'; \
198198
NOALLSYMSFLAGS=; \
199-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
199+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib'; \
200200
fi; $(LINK_SO_SHLIB)
201201
link_app.bsd:
202202
@if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \
203-
LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \
203+
LDFLAGS='$(CFLAGS) $(LDFLAGS)'; \
204204
fi; $(LINK_APP)
205205

206206
# For Darwin AKA Mac OS/X (dyld)
@@ -223,12 +223,12 @@ link_app.bsd:
223223
link_dso.darwin:
224224
@ ALLSYMSFLAGS=''; \
225225
NOALLSYMSFLAGS=''; \
226-
SHAREDFLAGS="$(CFLAGS) `echo $(SHARED_LDFLAGS) | sed s/dynamiclib/bundle/`"; \
226+
SHAREDFLAGS='$(CFLAGS) '"`echo '$(SHARED_LDFLAGS)' | sed s/dynamiclib/bundle/`"; \
227227
$(LINK_SO_DSO)
228228
link_shlib.darwin:
229229
@ ALLSYMSFLAGS='-all_load'; \
230230
NOALLSYMSFLAGS=''; \
231-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -current_version $(SHLIBVERSION) -compatibility_version $(SHLIBVERSION) -install_name $(INSTALLTOP)/$(LIBDIR)/$(SHLIBNAME_FULL)"; \
231+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -current_version $(SHLIBVERSION) -compatibility_version $(SHLIBVERSION) -install_name $(INSTALLTOP)/$(LIBDIR)/$(SHLIBNAME_FULL)'; \
232232
$(LINK_SO_SHLIB)
233233
link_app.darwin: # is there run-path on darwin?
234234
$(LINK_APP)
@@ -237,17 +237,17 @@ link_dso.cygwin:
237237
@ALLSYMSFLAGS=''; \
238238
NOALLSYMSFLAGS=''; \
239239
base=-Wl,--enable-auto-image-base; \
240-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic"; \
240+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS)'" -shared $$base -Wl,-Bsymbolic"; \
241241
$(LINK_SO_DSO)
242242
link_shlib.cygwin:
243243
@ INHIBIT_SYMLINKS=yes; \
244-
echo "$(PERL) $(SRCDIR)/util/mkrc.pl $(SHLIBNAME_FULL) |" \
245-
"$(RC) $(SHARED_RCFLAGS) -o rc.o"; \
244+
echo '$(PERL) $(SRCDIR)/util/mkrc.pl $(SHLIBNAME_FULL) |' \
245+
'$(RC) $(SHARED_RCFLAGS) -o rc.o'; \
246246
$(PERL) $(SRCDIR)/util/mkrc.pl $(SHLIBNAME_FULL) | \
247247
$(RC) $(SHARED_RCFLAGS) -o rc.o; \
248248
ALLSYMSFLAGS='-Wl,--whole-archive'; \
249249
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
250-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,--enable-auto-image-base -Wl,-Bsymbolic -Wl,--out-implib,$(SHLIBNAME) rc.o"; \
250+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,--enable-auto-image-base -Wl,-Bsymbolic -Wl,--out-implib,$(SHLIBNAME) rc.o'; \
251251
$(LINK_SO_SHLIB) || exit 1; \
252252
rm rc.o
253253
link_app.cygwin:
@@ -257,17 +257,17 @@ link_app.cygwin:
257257
# corresponding cygwin targets, as they do the exact same thing.
258258
link_shlib.mingw:
259259
@ INHIBIT_SYMLINKS=yes; \
260-
base=; [ $(LIBNAME) = "crypto" -a -n "$(FIPSCANLIB)" ] && base=-Wl,--image-base,0x63000000; \
260+
base=; [ '$(LIBNAME)' = 'crypto' -a -n '$(FIPSCANLIB)' ] && base=-Wl,--image-base,0x63000000; \
261261
$(PERL) $(SRCDIR)/util/mkdef.pl 32 $(LIBNAME) \
262262
| sed -e 's|^\(LIBRARY *\)$(LIBNAME)32|\1$(SHLIBNAME_FULL)|' \
263263
> $(LIBNAME).def; \
264-
echo "$(PERL) $(SRCDIR)/util/mkrc.pl $(SHLIBNAME_FULL) |" \
265-
"$(RC) $(SHARED_RCFLAGS) -o rc.o"; \
264+
echo '$(PERL) $(SRCDIR)/util/mkrc.pl $(SHLIBNAME_FULL) |' \
265+
'$(RC) $(SHARED_RCFLAGS) -o rc.o'; \
266266
$(PERL) $(SRCDIR)/util/mkrc.pl $(SHLIBNAME_FULL) | \
267267
$(RC) $(SHARED_RCFLAGS) -o rc.o; \
268268
ALLSYMSFLAGS='-Wl,--whole-archive'; \
269269
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
270-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,$(SHLIBNAME) $(LIBNAME).def rc.o"; \
270+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -shared '"$$base"' -Wl,-Bsymbolic -Wl,--out-implib,$(SHLIBNAME) $(LIBNAME).def rc.o'; \
271271
$(LINK_SO_SHLIB) || exit 1; \
272272
rm $(LIBNAME).def rc.o
273273

@@ -277,7 +277,7 @@ link_dso.alpha-osf1:
277277
else \
278278
ALLSYMSFLAGS=''; \
279279
NOALLSYMSFLAGS=''; \
280-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
280+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic'; \
281281
fi; \
282282
$(LINK_SO_DSO)
283283
link_shlib.alpha-osf1:
@@ -286,41 +286,41 @@ link_shlib.alpha-osf1:
286286
else \
287287
ALLSYMSFLAGS='-all'; \
288288
NOALLSYMSFLAGS='-none'; \
289-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic -set_version $(SHLIBVERSION)"; \
289+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic -set_version $(SHLIBVERSION)'; \
290290
fi; \
291291
$(LINK_SO_SHLIB)
292292
link_app.alpha-osf1:
293293
@if $(DETECT_GNU_LD); then \
294294
$(DO_GNU_APP); \
295295
else \
296-
LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \
296+
LDFLAGS='$(CFLAGS) $(LDFLAGS)'; \
297297
fi; \
298298
$(LINK_APP)
299299

300300
link_dso.solaris:
301301
@ if $(DETECT_GNU_LD); then \
302302
$(DO_GNU_DSO); \
303303
else \
304-
ALLSYMSFLAGS=""; \
305-
NOALLSYMSFLAGS=""; \
306-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $(SHLIBNAME_FULL) -Wl,-Bsymbolic"; \
304+
ALLSYMSFLAGS=''; \
305+
NOALLSYMSFLAGS=''; \
306+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -h $(SHLIBNAME_FULL) -Wl,-Bsymbolic'; \
307307
fi; \
308308
$(LINK_SO_DSO)
309309
link_shlib.solaris:
310310
@ if $(DETECT_GNU_LD); then \
311311
$(DO_GNU_SO); \
312312
else \
313313
$(PERL) $(SRCDIR)/util/mkdef.pl $(LIBNAME) linux >$(LIBNAME).map; \
314-
ALLSYMSFLAGS="-Wl,-z,allextract,-M,$(LIBNAME).map"; \
315-
NOALLSYMSFLAGS="-Wl,-z,defaultextract"; \
316-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $(SHLIBNAME_FULL) -Wl,-Bsymbolic"; \
314+
ALLSYMSFLAGS='-Wl,-z,allextract,-M,$(LIBNAME).map'; \
315+
NOALLSYMSFLAGS='-Wl,-z,defaultextract'; \
316+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -h $(SHLIBNAME_FULL) -Wl,-Bsymbolic'; \
317317
fi; \
318318
$(LINK_SO_SHLIB)
319319
link_app.solaris:
320320
@ if $(DETECT_GNU_LD); then \
321321
$(DO_GNU_APP); \
322322
else \
323-
LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \
323+
LDFLAGS='$(CFLAGS) $(LDFLAGS)'; \
324324
fi; \
325325
$(LINK_APP)
326326

@@ -331,7 +331,7 @@ link_dso.svr3:
331331
else \
332332
ALLSYMSFLAGS=''; \
333333
NOALLSYMSFLAGS=''; \
334-
SHAREDFLAGS="$(CFLAGS) -G -h $(SHLIBNAME_FULL)"; \
334+
SHAREDFLAGS='$(CFLAGS) -G -h $(SHLIBNAME_FULL)'; \
335335
fi; \
336336
$(LINK_SO_DSO)
337337
link_shlib.svr3:
@@ -340,7 +340,7 @@ link_shlib.svr3:
340340
else \
341341
ALLSYMSFLAGS=''; \
342342
NOALLSYMSFLAGS=''; \
343-
SHAREDFLAGS="$(CFLAGS) -G -h $(SHLIBNAME_FULL)"; \
343+
SHAREDFLAGS='$(CFLAGS) -G -h $(SHLIBNAME_FULL)'; \
344344
fi; \
345345
$(LINK_SO_SHLIB_UNPACKED)
346346
link_app.svr3:
@@ -356,7 +356,7 @@ link_dso.svr5:
356356
($(CC) -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
357357
ALLSYMSFLAGS=''; \
358358
NOALLSYMSFLAGS=''; \
359-
SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $(SHLIBNAME_FULL)"; \
359+
SHAREDFLAGS='$(CFLAGS) '"$${SHARE_FLAG}"' -h $(SHLIBNAME_FULL)'; \
360360
fi; \
361361
$(LINK_SO_DSO)
362362
link_shlib.svr5:
@@ -367,7 +367,7 @@ link_shlib.svr5:
367367
($(CC) -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
368368
ALLSYMSFLAGS=''; \
369369
NOALLSYMSFLAGS=''; \
370-
SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $(SHLIBNAME_FULL)"; \
370+
SHAREDFLAGS='$(CFLAGS) '"$${SHARE_FLAG}"' -h $(SHLIBNAME_FULL)'; \
371371
fi; \
372372
$(LINK_SO_SHLIB_UNPACKED)
373373
link_app.svr5:
@@ -378,24 +378,24 @@ link_dso.irix:
378378
@ if $(DETECT_GNU_LD); then \
379379
$(DO_GNU_DSO); \
380380
else \
381-
ALLSYMSFLAGS=""; \
382-
NOALLSYMSFLAGS=""; \
383-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$(SHLIBNAME_FULL),-B,symbolic"; \
381+
ALLSYMSFLAGS=''; \
382+
NOALLSYMSFLAGS=''; \
383+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$(SHLIBNAME_FULL),-B,symbolic'; \
384384
fi; \
385385
$(LINK_SO_DSO)
386386
link_shlib.irix:
387387
@ if $(DETECT_GNU_LD); then \
388388
$(DO_GNU_SO); \
389389
else \
390-
MINUSWL=""; \
391-
($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
390+
MINUSWL=''; \
391+
($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL='-Wl,'; \
392392
ALLSYMSFLAGS="$${MINUSWL}-all"; \
393393
NOALLSYMSFLAGS="$${MINUSWL}-none"; \
394-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$(SHLIBNAME_FULL),-B,symbolic"; \
394+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$(SHLIBNAME_FULL),-B,symbolic'; \
395395
fi; \
396396
$(LINK_SO_SHLIB)
397397
link_app.irix:
398-
@LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \
398+
@LDFLAGS='$(CFLAGS) $(LDFLAGS)'; \
399399
$(LINK_APP)
400400

401401
# 32-bit PA-RISC HP-UX embeds the -L pathname of libs we link with, so
@@ -411,7 +411,7 @@ link_dso.hpux:
411411
ALLSYMSFLAGS=''; \
412412
NOALLSYMSFLAGS=''; \
413413
expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
414-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$(SHLIBNAME_FULL),+cdp,../:,+cdp,./:"; \
414+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$(SHLIBNAME_FULL),+cdp,../:,+cdp,./:'; \
415415
fi; \
416416
rm -f $(SHLIBNAME_FULL) || :; \
417417
$(LINK_SO_DSO) && chmod a=rx $(SHLIBNAME_FULL)
@@ -420,34 +420,34 @@ link_shlib.hpux:
420420
ALLSYMSFLAGS='-Wl,-Fl'; \
421421
NOALLSYMSFLAGS=''; \
422422
expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
423-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$(SHLIBNAME_FULL),+cdp,../:,+cdp,./:"; \
423+
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$(SHLIBNAME_FULL),+cdp,../:,+cdp,./:'; \
424424
fi; \
425425
rm -f $(SHLIBNAME_FULL) || :; \
426426
$(LINK_SO_SHLIB) && chmod a=rx $(SHLIBNAME_FULL)
427427
link_app.hpux:
428428
@if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \
429-
LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,+s,+cdp,../:,+cdp,./:"; \
429+
LDFLAGS='$(CFLAGS) $(LDFLAGS) -Wl,+s,+cdp,../:,+cdp,./:'; \
430430
fi; \
431431
$(LINK_APP)
432432

433433
link_dso.aix:
434-
@OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || :; \
434+
@OBJECT_MODE=`expr 'x$(SHARED_LDFLAGS)' : 'x\-[a-z]*\(64\)'` || :; \
435435
OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
436436
ALLSYMSFLAGS=''; \
437437
NOALLSYMSFLAGS=''; \
438438
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
439439
rm -f $(SHLIBNAME_FULL) 2>&1 > /dev/null ; \
440440
$(LINK_SO_DSO);
441441
link_shlib.aix:
442-
@ OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || : ; \
442+
@ OBJECT_MODE=`expr 'x$(SHARED_LDFLAGS)' : 'x\-[a-z]*\(64\)'` || : ; \
443443
OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
444444
ALLSYMSFLAGS='-bnogc'; \
445445
NOALLSYMSFLAGS=''; \
446446
SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \
447447
rm -f $(SHLIBNAME_FULL) 2>&1 > /dev/null ; \
448448
$(LINK_SO_SHLIB_VIA_O)
449449
link_app.aix:
450-
LDFLAGS="$(CFLAGS) -Wl,-bsvr4 $(LDFLAGS)"; \
450+
LDFLAGS='$(CFLAGS) -Wl,-bsvr4 $(LDFLAGS)'; \
451451
$(LINK_APP)
452452

453453

0 commit comments

Comments
 (0)