diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rwxr-xr-x | tools/configure.template | 4 | ||||
| -rwxr-xr-x | tools/gen-configure.el | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -419,7 +419,7 @@ tryldflag LDFLAGS_AUTO -Wl,--sort-common CPPFLAGS_AUTO="${CPPFLAGS_AUTO}${addincpath}" if $evenmorestatic ; then - LDFLAGS_NOSHARED=-static + LDFLAGS_NOSHARED=" -static" fi if $shared ; then @@ -479,7 +479,7 @@ CFLAGS := ${CFLAGS}${CFLAGS_POST:+ }$CFLAGS_POST LDFLAGS_AUTO := $LDFLAGS_AUTO LDFLAGS := ${LDFLAGS}${LDFLAGS_POST:+ }$LDFLAGS_POST LDFLAGS_SHARED := $LDFLAGS_SHARED -LDFLAGS_NOSHARED := $LDFLAGS_NOSHARED +LDFLAGS_NOSHARED :=$LDFLAGS_NOSHARED CROSS_COMPILE := $cross vpath lib%.a$vpaths @@ -577,4 +577,4 @@ fi echo echo "#endif" exec 1>&3 3>&- -echo " ... done."
\ No newline at end of file +echo " ... done." diff --git a/tools/configure.template b/tools/configure.template index 54e5ea1..51fc2b4 100755 --- a/tools/configure.template +++ b/tools/configure.template @@ -405,7 +405,7 @@ tryldflag LDFLAGS_AUTO -Wl,--sort-common CPPFLAGS_AUTO="${CPPFLAGS_AUTO}${addincpath}" if $evenmorestatic ; then - LDFLAGS_NOSHARED=-static + LDFLAGS_NOSHARED=" -static" fi if $shared ; then @@ -465,7 +465,7 @@ CFLAGS := ${CFLAGS}${CFLAGS_POST:+ }$CFLAGS_POST LDFLAGS_AUTO := $LDFLAGS_AUTO LDFLAGS := ${LDFLAGS}${LDFLAGS_POST:+ }$LDFLAGS_POST LDFLAGS_SHARED := $LDFLAGS_SHARED -LDFLAGS_NOSHARED := $LDFLAGS_NOSHARED +LDFLAGS_NOSHARED :=$LDFLAGS_NOSHARED CROSS_COMPILE := $cross vpath lib%.a$vpaths diff --git a/tools/gen-configure.el b/tools/gen-configure.el index 577d86f..eba63fb 100755 --- a/tools/gen-configure.el +++ b/tools/gen-configure.el @@ -23,9 +23,9 @@ multisubstitute if { - heredoc 0 ${TEMPLATE} redirfd -w 1 configure.new - s6-cat + if { heredoc 0 ${TEMPLATE} s6-cat } + s6-echo } if { s6-chmod 0755 configure.new } |