epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

merge with 3.14.12.4-pre1

Browse Source 
keep out changes: INSTALL_LOCATION, COMPAT_TOOLS_313, COMPAT_313, USE_POSIX_THREAD_PRIORITY_SCHEDULING
This commit is contained in:
zimoch
2013-11-27 09:25:02 +00:00
parent 74859e2194
commit f9075a12b2
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure/CONFIG_SITE
+10 -5
View File
@@ -7,7 +7,7 @@
# in the file LICENSE that is included with this distribution.
#*************************************************************************
#
# Revision-Id: anj@aps.anl.gov-20110419200536-zulwts6vf1tr4uuc
# Revision-Id: anj@aps.anl.gov-20131120005049-xcx9o8ohtimzbib1
#
# CONFIG_SITE - Global site configuration file
#
@@ -19,6 +19,7 @@
# aix-ppc (IBM compiler used for host builds)
# aix-ppc-gnu (GNU compiler used for host builds)
# cygwin-x86 (cygwin compiler used for host builds)
# cygwin-x86_64 (cygwin compiler used for host builds)
# darwin-ppc (PowerPC based Apple running OSX)
# darwin-ppcx86 (Universal binaries for both CPUs)
# darwin-x86 (Intel based Apple running OSX)
@@ -41,6 +42,7 @@
# win32-x86-cygwin (WIN32 API with cygwin GNU compiler used for host builds)
# win32-x86-mingw (MinGW compiler used for host builds)
# windows-x64 (MS Visual C++ compiler used for host builds)
# windows-x64-mingw (MinGW compiler used for host builds)
# Debugging builds
# linux-x86-debug (GNU compiler with -g option for host builds)
@@ -72,6 +74,7 @@
# linux-cris (Axis GNU crosscompiler on linux-x86 host)
# linux-cris_v10 (Axis GNU crosscompiler on linux-x86 host)
# linux-cris_v32 (Axis GNU crosscompiler on linux-x86 host)
# linux-microblaze
# linux-xscale_be
# vxWorks-486
# vxWorks-68040
@@ -119,7 +122,7 @@ CROSS_COMPILER_HOST_ARCHS=
# NOTE: os/CONFIG.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files and
# os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(EPICS_HOST_ARCH) files may override
#
# NOTE WIN32: YES results in a DLL. Valid settings are
# NOTE Windows: YES results in a DLL. Valid settings are
# SHARED_LIBRARIES=YES and STATIC_BUILD=NO
# SHARED_LIBRARIES=NO and STATIC_BUILD=YES
#
@@ -184,7 +187,9 @@ EPICS_SITE_VERSION =
# between the various stages of compilation.
GCC_PIPE = NO
# Include RPATH when linking executables and libraries.
# must be either YES or NO
LINKER_USE_RPATH=YES
# Set RPATH when linking executables and libraries.
# Must be either YES or NO. If you set this to NO you must also provide a
# way for Base executables to find their shared libraries when they are
# run at build-time, e.g. set the LD_LIBRARY_PATH environment variable.
LINKER_USE_RPATH = YES