diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon index c3f1fcc3a..fd5023c6c 100644 --- a/configure/os/CONFIG.Common.UnixCommon +++ b/configure/os/CONFIG.Common.UnixCommon @@ -3,24 +3,21 @@ # $Id$ # # Contains definitions common to all Unix target archs -# CONFIG.Common. files will override # # This file is maintained by the build community. -# Sites may override common definitions in CONFIG_SITE.Common.UnixCommon +# Sites may override definitions in CONFIG_SITE.Common.UnixCommon +# or CONFIG_SITE..UnixCommon #------------------------------------------------------- # Unix valid build types - VALID_BUILDS = Host Ioc #------------------------------------------------------- # Gnu directory - GNU_DIR = /usr/local #------------------------------------------------------- # Unix prefix and suffix definitions - EXE = OBJ = .o #Library prefix and suffixes @@ -29,8 +26,7 @@ LIB_SUFFIX = .a SHRLIB_SUFFIX = .so$(addprefix .,$(SHRLIB_VERSION)) #------------------------------------------------------- -# adjust names of libraries to build -# +# names of libraries to build # -> lib.a LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX)) # -> lib.so. @@ -38,31 +34,22 @@ SHRLIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(SHRLIB_SUFFIX)) #------------------------------------------------------- # Shared library definitions - SHRLIB_LDFLAGS = $($(ANSI)_SHRLIB_LDFLAGS_$(strip $(SHARED_LIBRARIES))) SHRLIB_LDLIBS = $($*_LIBS:%=-l%) -INSTALL_SHRLIB = $(INSTALL_LIB) - #-------------------------------------------------- # Prod: dependancy definitions - PROD_DEPLIBS = $(foreach lib,$(PROD_LIBS) $(USR_LIBS),$(firstword $(wildcard \ $($(lib)_DIR)/$(LIB_PREFIX)$(lib).*))) #-------------------------------------------------- # Prod: LDFLAGS and LDLIBS definitions - DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(PROD_DEPLIBS)) DEPLIB_LDFLAGS += $(sort $(DEPLIB_DIRS:%=-L%)) DEPLIB_LDLIBS = $($*_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\ $($*_SYS_LIBS:%=-l%) $(SYS_PROD_LIBS:%=-l%) -######Above DEPLIB_LDFLAGS and DEPLIB_LDLIBS defs might be able to be replaced by the -###### following def if we look for *.so followed by *.a with check for STATIC BUILD -######DEPLIB_LDLIBS = $($*_DEPLIBS) $(PROD_DEPLIBS) $(SYS_PROD_LIBS:%=-l%) - #-------------------------------------------------- # Allow code to be used in a shared library GCC_DEP_CFLAGS = -fPIC diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index eee5ad1ac..e408f82db 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -1,13 +1,15 @@ # CONFIG.Common.vxWorksCommon # # $Id$ -# This file is maintained by the build community. # # Definitions for vxWorks target archs +# +# This file is maintained by the build community. # Sites may override these definitions in CONFIG_SITE.Common.vxWorksCommon +# or CONFIG_SITE..vxWorksCommon #------------------------------------------------------- -# Vx valid build types and include directory suffixes +# Vx valid build types VALID_BUILDS = Ioc #-------------------------------------------------- @@ -34,28 +36,19 @@ INSTALL_LOCATION_LIB=$(INSTALL_LOCATION)/bin #-------------------------------------------------- # vxWorks directory definitions - -# The definitions GNU_DIR, GNU_BIN and GNU_LIB -# can be overridden for specific host architectures -# by creating a CONFIG_SITE.Host. file with -# the override definitions. - # Tornado directory definitions VX_INCLUDE = $(VX_DIR)/target/h GNU_DIR = $(VX_DIR)/host/$(WIND_HOST_TYPE) +#------------------------------------------------------- +# Command definition overrides GCC_LD = $(GNU_BIN)/$(GNU_TARGET_PREFIX)ld$(CMPLR_SUFFIX) -r -#------------------------------------------------------- -# GCC override # use ld partial linking not ar to create libraries) GCC_AR = $(GCC_LD) ARFLAGS = -o GCC_RANLIB = -GCC_DEP_CPPFLAGS = -D_REENTRANT -G++_DEP_CPPFLAGS = -D_REENTRANT - #-------------------------------------------------- # C++ host processing NM = $(GNU_BIN)/$(GNU_TARGET_PREFIX)nm$(CMPLR_SUFFIX) @@ -72,8 +65,13 @@ else MUNCH = $(GNU_BIN)/$(GNU_TARGET_PREFIX)munch$(EXE) endif +#------------------------------------------------------- +# Compile flag overrides +GCC_DEP_CPPFLAGS = -D_REENTRANT +G++_DEP_CPPFLAGS = -D_REENTRANT + #-------------------------------------------------- -# Posix flags +# Posix flags override POSIX_CPPFLAGS = #-------------------------------------------------- @@ -96,11 +94,11 @@ G++_OPT_YES = -O2 G++_OPT_NO = -g #-------------------------------------------------- -# c++ exceptions, YES or NO +# c++ exceptions, YES or NO override CXX_EXCEPTIONS = NO #-------------------------------------------------- -# osithead use default stack, YES or NO +# osithead use default stack, YES or NO override OSITHREAD_USE_DEFAULT_STACK = NO #--------------------------------------------------