Simplified SHRLIB_LDFLAGS_YES/NO to SHRLIB_LDFLAGS.
This commit is contained in:
@ -43,6 +43,5 @@ OPT_CXXFLAGS_NO = -g
|
||||
STATIC_LDFLAGS_YES = -static
|
||||
STATIC_LDFLAGS_NO =
|
||||
|
||||
SHRLIB_LDFLAGS_YES += -shared
|
||||
SHRLIB_LDFLAGS_NO +=
|
||||
SHRLIB_LDFLAGS += -shared -fPIC
|
||||
|
||||
|
@ -37,7 +37,6 @@ SHRLIBNAME_YES = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(SHRLIB_SUFFIX))
|
||||
SHRLIB_DEPLIBS = $(foreach lib,$(SHRLIB_LIBS),$(firstword $(wildcard \
|
||||
$($(lib)_DIR)/$(LIB_PREFIX)$(lib).*)))
|
||||
|
||||
SHRLIB_LDFLAGS = $(SHRLIB_LDFLAGS_$(strip $(SHARED_LIBRARIES)))
|
||||
SHRLIB_LDLIBS = $($*_LDLIBS:%=-l%) $(SHRLIB_LIBS:%=-l%) \
|
||||
$($*_SYS_LIBS:%=-l%) $(SYS_SHRLIB_LIBS:%=-l%)
|
||||
|
||||
|
@ -31,7 +31,7 @@ ARCH_DEP_CFLAGS += -mcpu=pentium
|
||||
|
||||
# Set runtime path for shared libraries
|
||||
PROD_LDFLAGS_YES += $(sort $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%/lib/$(T_A)))
|
||||
SHRLIB_LDFLAGS_YES += $(sort $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%/lib/$(T_A)))
|
||||
SHRLIB_LDFLAGS += $(sort $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%/lib/$(T_A)))
|
||||
PROD_LDFLAGS += $(PROD_LDFLAGS_$(SHARED_LIBRARIES))
|
||||
|
||||
ifdef CROSS
|
||||
|
@ -18,4 +18,3 @@ AR = ar -rc
|
||||
RANLIB=
|
||||
LD = ld -r
|
||||
|
||||
SHRLIB_LDFLAGS_YES += -fPIC
|
||||
|
@ -53,4 +53,4 @@ STATIC_LDLIBS_YES=
|
||||
STATIC_LDLIBS_NO=
|
||||
TARGET_LDFLAGS += -AA -mt
|
||||
|
||||
SHRLIB_LDFLAGS_YES = -b
|
||||
SHRLIB_LDFLAGS = -b
|
||||
|
@ -40,7 +40,7 @@ STATIC_LDFLAGS_NO=
|
||||
STATIC_LDLIBS_YES= -Bdynamic
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
SHRLIB_LDFLAGS_YES = -shared
|
||||
SHRLIB_LDFLAGS = -shared
|
||||
|
||||
############# ???????????
|
||||
#####ACC_SFLAGS_YES= -non_shared
|
||||
|
@ -23,5 +23,5 @@ STATIC_LDFLAGS_NO=
|
||||
STATIC_LDLIBS_YES= -Bdynamic
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
#SHRLIB_LDFLAGS_YES = -G -h $@ -z ignore -z combreloc -z lazyload
|
||||
SHRLIB_LDFLAGS = -G -h $@ -z ignore -z combreloc -z lazyload
|
||||
|
||||
|
@ -19,14 +19,16 @@ RANLIB =
|
||||
|
||||
#Prepare the object code for profiling with prof. (YES or NO)
|
||||
PROFILE=NO
|
||||
#Prepare the object code for profiling with gprof. (YES or NO)
|
||||
GPROF=NO
|
||||
|
||||
# Configure OS vendor C compiler
|
||||
CONFORM_CFLAGS_ANSI = -Xa -v
|
||||
CONFORM_CFLAGS_STRICT = -Xc -v
|
||||
CONFORM_CFLAGS_TRAD = -Xs
|
||||
PROF_CFLAGS_YES = -p
|
||||
PROF_CFLAGS_NO =
|
||||
CODE_CFLAGS = -KPIC $(PROF_CFLAGS_$(PROFILE))
|
||||
GPROF_CFLAGS_YES = -xpg
|
||||
CODE_CFLAGS = -KPIC $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
|
||||
WARN_CFLAGS_YES =
|
||||
WARN_CFLAGS_NO = -w
|
||||
OPT_CFLAGS_YES = -xO4
|
||||
@ -36,8 +38,8 @@ OPT_CFLAGS_NO = -g
|
||||
CONFORM_CXXFLAGS_NORMAL =
|
||||
CONFORM_CXXFLAGS_STRICT =
|
||||
PROF_CXXFLAGS_YES = -p
|
||||
PROF_CXXFLAGS_NO =
|
||||
CODE_CXXFLAGS = -KPIC $(PROF_CXXFLAGS_$(PROFILE))
|
||||
GPROF_CXXFLAGS_YES = -xpg
|
||||
CODE_CXXFLAGS = -KPIC $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
|
||||
WARN_CXXFLAGS_YES = +w
|
||||
WARN_CXXFLAGS_NO =
|
||||
OPT_CXXFLAGS_YES = -O
|
||||
@ -48,6 +50,5 @@ STATIC_LDFLAGS_NO=
|
||||
STATIC_LDLIBS_YES= -Bdynamic
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
SHRLIB_LDFLAGS_YES = -G -h $@ -z ignore -z combreloc -z lazyload
|
||||
|
||||
SHRLIB_LDFLAGS = -G -h $@ -z ignore -z combreloc -z lazyload
|
||||
|
||||
|
@ -28,8 +28,8 @@ CONFORM_CFLAGS_ANSI = -Xa -v
|
||||
CONFORM_CFLAGS_STRICT = -Xc -v
|
||||
CONFORM_CFLAGS_TRAD = -Xs
|
||||
PROF_CFLAGS_YES = -p
|
||||
PROF_CFLAGS_NO =
|
||||
CODE_CFLAGS = -KPIC $(PROF_CFLAGS_$(PROFILE))
|
||||
GPROF_CFLAGS_YES = -xpg
|
||||
CODE_CFLAGS = -KPIC $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
|
||||
WARN_CFLAGS_YES =
|
||||
WARN_CFLAGS_NO = -w
|
||||
OPT_CFLAGS_YES = -xO4
|
||||
@ -39,8 +39,8 @@ OPT_CFLAGS_NO = -g
|
||||
CONFORM_CXXFLAGS_NORMAL =
|
||||
CONFORM_CXXFLAGS_STRICT =
|
||||
PROF_CXXFLAGS_YES = -p
|
||||
PROF_CXXFLAGS_NO =
|
||||
CODE_CXXFLAGS = -KPIC $(PROF_CXXFLAGS_$(PROFILE))
|
||||
GPROF_CXXFLAGS_YES = -xpg
|
||||
CODE_CXXFLAGS = -KPIC $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
|
||||
WARN_CXXFLAGS_YES = +w
|
||||
WARN_CXXFLAGS_NO =
|
||||
OPT_CXXFLAGS_YES = -O
|
||||
@ -51,5 +51,5 @@ STATIC_LDFLAGS_NO=
|
||||
STATIC_LDLIBS_YES= -Bdynamic
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
SHRLIB_LDFLAGS_YES = -G -h $@ -z ignore -z combreloc -z lazyload
|
||||
SHRLIB_LDFLAGS = -G -h $@ -z ignore -z combreloc -z lazyload
|
||||
|
||||
|
@ -44,5 +44,5 @@ STATIC_LDFLAGS_NO=
|
||||
STATIC_LDLIBS_YES= -Bdynamic
|
||||
STATIC_LDLIBS_NO=
|
||||
|
||||
SHRLIB_LDFLAGS_YES = -assert pure-text -h $@
|
||||
SHRLIB_LDFLAGS = -assert pure-text -h $@
|
||||
|
||||
|
Reference in New Issue
Block a user