浏览代码

[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.

Noriko Hosoi 20 年之前
父节点
当前提交
d5794ea88c
共有 1 个文件被更改,包括 12 次插入8 次删除
  1. 12 8
      ldap/servers/slapd/tools/Makefile

+ 12 - 8
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)