Commit 4d94e99b authored by Bruce Momjian's avatar Bruce Momjian

> This lets you do something like:

>
>    ./configure LDFLAGS=-static-libgcc LDFLAGS_SL=-static-libgcc
>
> to produce binaries that do not depend on libgcc_s.so at all.

Oliver Jowett
parent 063216ef
...@@ -757,6 +757,10 @@ ac_env_CPP_set=${CPP+set} ...@@ -757,6 +757,10 @@ ac_env_CPP_set=${CPP+set}
ac_env_CPP_value=$CPP ac_env_CPP_value=$CPP
ac_cv_env_CPP_set=${CPP+set} ac_cv_env_CPP_set=${CPP+set}
ac_cv_env_CPP_value=$CPP ac_cv_env_CPP_value=$CPP
ac_env_LDFLAGS_SL_set=${LDFLAGS_SL+set}
ac_env_LDFLAGS_SL_value=$LDFLAGS_SL
ac_cv_env_LDFLAGS_SL_set=${LDFLAGS_SL+set}
ac_cv_env_LDFLAGS_SL_value=$LDFLAGS_SL
ac_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set} ac_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set}
ac_env_DOCBOOKSTYLE_value=$DOCBOOKSTYLE ac_env_DOCBOOKSTYLE_value=$DOCBOOKSTYLE
ac_cv_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set} ac_cv_env_DOCBOOKSTYLE_set=${DOCBOOKSTYLE+set}
...@@ -881,6 +885,7 @@ Some influential environment variables: ...@@ -881,6 +885,7 @@ Some influential environment variables:
CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir> headers in a nonstandard directory <include dir>
CPP C preprocessor CPP C preprocessor
LDFLAGS_SL
DOCBOOKSTYLE DOCBOOKSTYLE
location of DocBook stylesheets location of DocBook stylesheets
...@@ -3499,6 +3504,7 @@ echo "$as_me: using CPPFLAGS=$CPPFLAGS" >&6;} ...@@ -3499,6 +3504,7 @@ echo "$as_me: using CPPFLAGS=$CPPFLAGS" >&6;}
echo "$as_me: using LDFLAGS=$LDFLAGS" >&6;} echo "$as_me: using LDFLAGS=$LDFLAGS" >&6;}
for ac_prog in gawk mawk nawk awk for ac_prog in gawk mawk nawk awk
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
...@@ -18883,6 +18889,7 @@ s,@with_pam@,$with_pam,;t t ...@@ -18883,6 +18889,7 @@ s,@with_pam@,$with_pam,;t t
s,@with_rendezvous@,$with_rendezvous,;t t s,@with_rendezvous@,$with_rendezvous,;t t
s,@with_openssl@,$with_openssl,;t t s,@with_openssl@,$with_openssl,;t t
s,@ELF_SYS@,$ELF_SYS,;t t s,@ELF_SYS@,$ELF_SYS,;t t
s,@LDFLAGS_SL@,$LDFLAGS_SL,;t t
s,@AWK@,$AWK,;t t s,@AWK@,$AWK,;t t
s,@FLEX@,$FLEX,;t t s,@FLEX@,$FLEX,;t t
s,@FLEXFLAGS@,$FLEXFLAGS,;t t s,@FLEXFLAGS@,$FLEXFLAGS,;t t
......
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.380 2004/10/06 09:35:19 momjian Exp $ dnl $PostgreSQL: pgsql/configure.in,v 1.381 2004/10/15 05:10:59 momjian Exp $
dnl dnl
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
...@@ -532,6 +532,7 @@ LDFLAGS="$LDFLAGS $LIBDIRS" ...@@ -532,6 +532,7 @@ LDFLAGS="$LDFLAGS $LIBDIRS"
AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS]) AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS])
AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS]) AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS])
AC_ARG_VAR(LDFLAGS_SL)
AC_PROG_AWK AC_PROG_AWK
PGAC_PATH_FLEX PGAC_PATH_FLEX
......
# -*-makefile-*- # -*-makefile-*-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.201 2004/10/11 19:32:19 tgl Exp $ # $PostgreSQL: pgsql/src/Makefile.global.in,v 1.202 2004/10/15 05:11:00 momjian Exp $
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets, # All PostgreSQL makefiles include this file and use the variables it sets,
...@@ -202,6 +202,7 @@ LD = @LD@ ...@@ -202,6 +202,7 @@ LD = @LD@
with_gnu_ld = @with_gnu_ld@ with_gnu_ld = @with_gnu_ld@
ld_R_works = @ld_R_works@ ld_R_works = @ld_R_works@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LDFLAGS_SL = @LDFLAGS_SL@
LDREL = -r LDREL = -r
LDOUT = -o LDOUT = -o
RANLIB = @RANLIB@ RANLIB = @RANLIB@
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California # Copyright (c) 1998, Regents of the University of California
# #
# IDENTIFICATION # IDENTIFICATION
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.84 2004/10/13 10:20:04 momjian Exp $ # $PostgreSQL: pgsql/src/Makefile.shlib,v 1.85 2004/10/15 05:11:00 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -272,7 +272,7 @@ ifneq ($(PORTNAME), aix) ...@@ -272,7 +272,7 @@ ifneq ($(PORTNAME), aix)
# Normal case # Normal case
$(shlib): $(OBJS) $(shlib): $(OBJS)
$(LINK.shared) $(OBJS) $(SHLIB_LINK) -o $@ $(LINK.shared) $(LDFLAGS_SL) $(OBJS) $(SHLIB_LINK) -o $@
# If we're using major and minor versions, then make a symlink to major-version-only. # If we're using major and minor versions, then make a symlink to major-version-only.
ifneq ($(shlib), $(shlib_major)) ifneq ($(shlib), $(shlib_major))
rm -f $(shlib_major) rm -f $(shlib_major)
...@@ -307,7 +307,7 @@ else # PORTNAME == cygwin ...@@ -307,7 +307,7 @@ else # PORTNAME == cygwin
# Cygwin case # Cygwin case
$(shlib) lib$(NAME).a: $(OBJS) $(shlib) lib$(NAME).a: $(OBJS)
$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS) $(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
$(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK) $(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a $(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
endif # PORTNAME == cygwin endif # PORTNAME == cygwin
...@@ -317,7 +317,7 @@ else # PORTNAME == win32 ...@@ -317,7 +317,7 @@ else # PORTNAME == win32
# win32 case # win32 case
$(shlib) lib$(NAME).a: $(OBJS) $(shlib) lib$(NAME).a: $(OBJS)
$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS) $(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
$(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK) $(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a $(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
endif # PORTNAME == win32 endif # PORTNAME == win32
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment