Moved GNU_DIR def to CONFIG_COMMON.
Moved *SHRLIB_LDFLAGS defs to CONFIG.gnuCommon.
This commit is contained in:
@ -53,6 +53,8 @@ STATIC_LDFLAGS_YES = -static
|
||||
STATIC_LDFLAGS_NO =
|
||||
|
||||
SHRLIB_CFLAGS = -fPIC
|
||||
SHRLIB_LDFLAGS = -shared -fPIC
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
|
||||
|
||||
GNU_LDLIBS_YES = -lgcc
|
||||
|
||||
|
@ -47,6 +47,12 @@ CHECK_RELEASE_YES = checkRelease
|
||||
CHECK_RELEASE_NO =
|
||||
CHECK_RELEASE_WARN = warnRelease
|
||||
|
||||
#-------------------------------------------------------
|
||||
# GNU directory
|
||||
# GNU_DIR definition is here because it is used to find
|
||||
# READLINE library even if GNU compiler is not used
|
||||
GNU_DIR = /usr
|
||||
|
||||
#-------------------------------------------------------
|
||||
# Directories
|
||||
|
||||
|
@ -12,10 +12,6 @@
|
||||
# Unix valid build types
|
||||
VALID_BUILDS = Host Ioc
|
||||
|
||||
#-------------------------------------------------------
|
||||
# Gnu directory
|
||||
GNU_DIR = /usr/local
|
||||
|
||||
#-------------------------------------------------------
|
||||
# Unix prefix and suffix definitions
|
||||
EXE =
|
||||
|
@ -1,8 +1,8 @@
|
||||
# CONFIG.aix-ppc.aix-ppc
|
||||
# CONFIG.aix-ppc-gnu.aix-ppc-gnu
|
||||
#
|
||||
#
|
||||
# Definitions for aix-ppc host - aix-ppc target builds
|
||||
# Sites may override these definitions in CONFIG_SITE.aix-ppc.aix-ppc
|
||||
# Definitions for aix-ppc-gnu host - aix-ppc-gnu target builds
|
||||
# Sites may override these definitions in CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu
|
||||
#-------------------------------------------------------
|
||||
|
||||
# Include common gnu compiler definitions
|
||||
@ -14,6 +14,3 @@ AR = ar
|
||||
ARFLAGS = rcv
|
||||
RANLIB = ranlib -t
|
||||
|
||||
SHRLIB_LDFLAGS = -shared -fPIC
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
|
||||
|
||||
|
@ -19,8 +19,10 @@ AR = ar -rc
|
||||
LD = ld -r
|
||||
RANLIB = ranlib
|
||||
|
||||
# Avoid position-independent code is always generated message
|
||||
# Avoid 'position-independent code is always generated' message
|
||||
SHRLIB_CFLAGS =
|
||||
SHRLIB_LDFLAGS = -shared
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared
|
||||
|
||||
# -ansi eliminates strdup
|
||||
CONFORM_CFLAGS_ANSI =
|
||||
@ -28,4 +30,3 @@ CONFORM_CFLAGS_STRICT = -pedantic
|
||||
CONFORM_CXXFLAGS_NORMAL =
|
||||
CONFORM_CXXFLAGS_STRICT = -pedantic
|
||||
|
||||
|
||||
|
@ -1,19 +1,14 @@
|
||||
# $Id$
|
||||
#
|
||||
# Definitions for freebsd-x86_64 host - freebsd-x86_64 target builds
|
||||
# Sites may override these definitions in CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
|
||||
# Definitions for freebsd-x86 host - freebsd-x86 target builds
|
||||
# Sites may override these definitions in CONFIG_SITE.freebsd-x86.freebsd-x86
|
||||
#-------------------------------------------------------
|
||||
|
||||
# Include common gnu compiler definitions
|
||||
include $(CONFIG)/CONFIG.gnuCommon
|
||||
|
||||
GNU_DIR = /usr
|
||||
|
||||
STATIC_LDFLAGS_YES= -Wl,-Bstatic
|
||||
STATIC_LDFLAGS_NO=
|
||||
STATIC_LDLIBS_YES= -Wl,-Bdynamic
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
SHRLIB_LDFLAGS += -shared -fPIC
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
|
||||
|
||||
|
@ -7,13 +7,8 @@
|
||||
# Include common gnu compiler definitions
|
||||
include $(CONFIG)/CONFIG.gnuCommon
|
||||
|
||||
GNU_DIR = /usr
|
||||
|
||||
STATIC_LDFLAGS_YES= -Wl,-Bstatic
|
||||
STATIC_LDFLAGS_NO=
|
||||
STATIC_LDLIBS_YES= -Wl,-Bdynamic
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
SHRLIB_LDFLAGS += -shared -fPIC
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
|
||||
|
||||
|
@ -24,6 +24,3 @@ STATIC_LDLIBS_NO =
|
||||
POSIX_CPPFLAGS += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L
|
||||
USR_SYS_LIBS += pthread
|
||||
|
||||
# C++ templates need PIC definition also in link phase
|
||||
SHRLIB_LDFLAGS += -shared -fPIC
|
||||
LOADABLE_SHRLIB_LDFLAGS += $(SHRLIB_LDFLAGS)
|
||||
|
@ -8,13 +8,3 @@
|
||||
# Include common gnu compiler definitions
|
||||
include $(CONFIG)/CONFIG.gnuCommon
|
||||
|
||||
GNU_DIR = /usr
|
||||
|
||||
CC = $(GNU_BIN)/gcc
|
||||
CCC = $(GNU_BIN)/g++
|
||||
|
||||
SHRLIB_LDFLAGS = -shared -fPIC
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
|
||||
|
||||
GNU_LDLIBS_YES = -lgcc
|
||||
|
||||
|
@ -9,6 +9,10 @@
|
||||
# Include common gnu compiler definitions
|
||||
include $(CONFIG)/CONFIG.gnuCommon
|
||||
SHRLIB_CFLAGS =
|
||||
SHRLIB_LDFLAGS =
|
||||
LOADABLE_SHRLIB_LDFLAGS =
|
||||
GPROF=NO
|
||||
PROFILE=NO
|
||||
|
||||
GNU_DIR = /usr
|
||||
|
||||
|
@ -4,17 +4,9 @@
|
||||
# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-arm
|
||||
#-------------------------------------------------------
|
||||
|
||||
# Include common gnu compiler definitions
|
||||
include $(CONFIG)/CONFIG.gnuCommon
|
||||
|
||||
GNU_DIR = /usr
|
||||
|
||||
# Copied from x86.x86
|
||||
STATIC_LDFLAGS_YES= -Wl,-Bstatic
|
||||
STATIC_LDFLAGS_NO=
|
||||
STATIC_LDLIBS_YES= -Wl,-Bdynamic
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
SHRLIB_LDFLAGS += -shared -fPIC
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
|
||||
|
||||
|
@ -8,9 +8,6 @@
|
||||
# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-cris
|
||||
#-------------------------------------------------------
|
||||
|
||||
# Include common gnu compiler definitions
|
||||
include $(CONFIG)/CONFIG.gnuCommon
|
||||
|
||||
GNU_DIR = $(CRIS_CROSS_COMPILER)
|
||||
|
||||
#STATIC_...
|
||||
@ -34,9 +31,6 @@ endif
|
||||
STATIC_LDLIBS_YES=
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
SHRLIB_LDFLAGS += -shared -fPIC
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
|
||||
|
||||
OPT_CXXFLAGS_YES = -Os
|
||||
|
||||
ifeq ($(STATIC_BUILD), YES)
|
||||
|
@ -9,13 +9,8 @@
|
||||
# Include common gnu compiler definitions
|
||||
include $(CONFIG)/CONFIG.gnuCommon
|
||||
|
||||
GNU_DIR = /usr
|
||||
|
||||
STATIC_LDFLAGS_YES= -Wl,-Bstatic
|
||||
STATIC_LDFLAGS_NO=
|
||||
STATIC_LDLIBS_YES= -Wl,-Bdynamic
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
SHRLIB_LDFLAGS += -shared -fPIC
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
|
||||
|
||||
|
@ -9,13 +9,8 @@
|
||||
# Include common gnu compiler definitions
|
||||
include $(CONFIG)/CONFIG.gnuCommon
|
||||
|
||||
GNU_DIR = /usr
|
||||
|
||||
STATIC_LDFLAGS_YES= -Wl,-Bstatic
|
||||
STATIC_LDFLAGS_NO=
|
||||
STATIC_LDLIBS_YES= -Wl,-Bdynamic
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
SHRLIB_LDFLAGS += -shared -fPIC
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
|
||||
|
||||
|
@ -19,8 +19,5 @@ STATIC_LDFLAGS_NO=
|
||||
STATIC_LDLIBS_YES= -Wl,-Bdynamic
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
SHRLIB_LDFLAGS += -shared -fPIC
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC
|
||||
|
||||
OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
|
||||
|
||||
|
@ -14,7 +14,7 @@ AR = ar -rc
|
||||
RANLIB=
|
||||
LD = ld -r
|
||||
|
||||
SHRLIB_LDFLAGS += -shared -fPIC -h $@ -z defs
|
||||
LOADABLE_SHRLIB_LDFLAGS += -shared -fPIC -h $@
|
||||
SHRLIB_LDFLAGS += -h $@ -z defs
|
||||
LOADABLE_SHRLIB_LDFLAGS += -h $@
|
||||
|
||||
OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload
|
||||
|
@ -19,6 +19,8 @@ RANLIB = ranlib
|
||||
# Dont use -fPIC: with -fPIC we get
|
||||
# "warning: -fPIC ignored for target (all code is position independent) "
|
||||
SHRLIB_CFLAGS =
|
||||
SHRLIB_LDFLAGS = -shared
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared
|
||||
|
||||
# Dont use -ansi: -ansi eliminates strdup and _tempnam
|
||||
CONFORM_CFLAGS_ANSI =
|
||||
|
@ -21,6 +21,8 @@ RANLIB = ranlib
|
||||
|
||||
# Avoid "position-independent code is always generated" message
|
||||
SHRLIB_CFLAGS =
|
||||
SHRLIB_LDFLAGS = -shared
|
||||
LOADABLE_SHRLIB_LDFLAGS = -shared
|
||||
|
||||
# Dont use -ansi option: eliminates strdup and _tempnam
|
||||
CONFORM_CFLAGS_ANSI =
|
||||
|
@ -5,13 +5,4 @@
|
||||
# Site specific definitions for linux-x86_64 host - linux-x86_64 target builds
|
||||
#-------------------------------------------------------
|
||||
|
||||
# -z defs causes problems for Linux
|
||||
#The -z defs option causes the linker to not ignore
|
||||
# unresolved references when building a shared library
|
||||
# Forces a fatal error if any undefined symbols remain
|
||||
# at the end of the link
|
||||
# So we will override the definition of SHRLIB_LDFLAGS
|
||||
# in "CONFIG.linux-x86_64.linux-x86_64"
|
||||
|
||||
SHRLIB_LDFLAGS= -shared
|
||||
|
||||
|
Reference in New Issue
Block a user