From b68112ba6a478e5c143840c1f8d0529bdbbc2b43 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 2 Sep 2003 20:51:38 +0000 Subject: [PATCH] Enabled mixed building mode (see bug report [EPICS Base R3.14.x 0000040]) --- configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu | 9 +++++---- configure/os/CONFIG.hpux-parisc.hpux-parisc | 7 ++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu b/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu index 316c31d01..0910bc7fe 100644 --- a/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu +++ b/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu @@ -16,10 +16,11 @@ AR = ar -rc RANLIB= LD = ld -r -# Always keep libc shared to force using the one supplied with the -# target machine (HP system and libc must match - important e.g. for -# multi-CPU-systems) -STATIC_LDFLAGS_YES = -static -l:libc.sl +STATIC_LDFLAGS_YES= -Wl,-a,archive +STATIC_LDFLAGS_NO = + +STATIC_LDLIBS_YES = -Wl,-a,default +STATIC_LDLIBS_NO = # Switch explicitly from default DCE threads to posix threads POSIX_CPPFLAGS_YES += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L diff --git a/configure/os/CONFIG.hpux-parisc.hpux-parisc b/configure/os/CONFIG.hpux-parisc.hpux-parisc index 3bfb54784..8a14e65a1 100644 --- a/configure/os/CONFIG.hpux-parisc.hpux-parisc +++ b/configure/os/CONFIG.hpux-parisc.hpux-parisc @@ -43,13 +43,10 @@ WARN_CXXFLAGS_NO = OPT_CXXFLAGS_YES = +O3 OPT_CXXFLAGS_NO = -g -# Always keep libc shared to force using the one supplied with the -# target machine (HP system and libc must match - important e.g. for -# multi-CPU-systems) -STATIC_LDFLAGS_YES= -Wl,-a,archive -l:libc.sl +STATIC_LDFLAGS_YES= -Wl,-a,archive STATIC_LDFLAGS_NO = -STATIC_LDLIBS_YES = +STATIC_LDLIBS_YES = -Wl,-a,default STATIC_LDLIBS_NO = TARGET_LDFLAGS += -AA -mt