summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2006-01-28 02:26:06 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2006-01-28 02:26:06 +0000
commitd5794ea88c04f28e412cf3dec91bfb157c8fe8ad (patch)
tree1fa5b268aa3a67765594d9ca96b539660fe60894
parent48046e504ee12d5349cc3d5865d24196cc427fe6 (diff)
downloadds-d5794ea88c04f28e412cf3dec91bfb157c8fe8ad.tar.gz
ds-d5794ea88c04f28e412cf3dec91bfb157c8fe8ad.tar.xz
ds-d5794ea88c04f28e412cf3dec91bfb157c8fe8ad.zip
[170348] RSEARCH needs to be updated
Fixed the broken build (64-bit). LDFLAG (set in the tools/Makefile) was not passed to rsearch and ldclt.
-rw-r--r--ldap/servers/slapd/tools/Makefile20
1 files changed, 12 insertions, 8 deletions
diff --git a/ldap/servers/slapd/tools/Makefile b/ldap/servers/slapd/tools/Makefile
index 55c483f0..689231c3 100644
--- a/ldap/servers/slapd/tools/Makefile
+++ b/ldap/servers/slapd/tools/Makefile
@@ -77,12 +77,16 @@ DEFS += $(SSL)
OBJS1 += $(OBJDEST)/pwenc.o
ifeq ($(USE_64), 1)
-ifeq ($(ARCH), HPUX)
-LDFLAGS += -lpthread +DA2.0W +DS2.0 +Z
-endif
-ifeq ($(ARCH), SOLARIS)
-LDFLAGS += -xarch=v9
-endif
+ ifeq ($(ARCH), HPUX)
+ ifeq ($(NSOS_RELEASE),B.11.23)
+ LDFLAGS += -lpthread +DD64
+ else
+ LDFLAGS += -lpthread +DA2.0W +DS2.0 +Z
+ endif
+ endif
+ ifeq ($(ARCH), SOLARIS)
+ LDFLAGS += -xarch=v9
+ endif
endif
CFLAGS += $(ARCH_CFLAGS)
@@ -200,10 +204,10 @@ $(OBJDEST):
$(MKDIR) $(OBJDEST)
buildRsearch:
- cd rsearch; $(MAKE)
+ cd rsearch; $(MAKE) LDFLAGS="$(LDFLAGS)"
buildLdclt:
- cd ldclt; $(MAKE)
+ cd ldclt; $(MAKE) LDFLAGS="$(LDFLAGS)"
clean:
-$(RM) $(ALL_OBJS)