mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 23:31:56 +00:00
Removed hardcoded AIX pathnames /usr/lpp/xlC from the makefiles,
because the new version of AIX xlC compilers (3.6.4) is installed in a different directory (/usr/ibmcxx).
This commit is contained in:
parent
c2cfb8b82f
commit
1d3e4ba47a
@ -110,11 +110,7 @@ endif
|
||||
|
||||
# AIX
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
ifeq ($(CLASSIC_NSPR),1)
|
||||
LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lpp/xlC/lib:/usr/lib:/lib
|
||||
else
|
||||
LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
|
||||
endif
|
||||
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
|
||||
ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
|
||||
LIBPR = -lnspr$(NSPR_VERSION)_shr
|
||||
LIBPLC = -lplc$(NSPR_VERSION)_shr
|
||||
|
@ -70,10 +70,12 @@ else
|
||||
OS_LIBS += -lC_r -lc_r
|
||||
endif
|
||||
else
|
||||
# makeC++SharedLib(_r) is in either /usr/lpp/xlC/bin
|
||||
# or /usr/ibmcxx/bin.
|
||||
ifeq ($(CLASSIC_NSPR),1)
|
||||
MKSHLIB = /usr/lpp/xlC/bin/makeC++SharedLib -p 0
|
||||
MKSHLIB = makeC++SharedLib -p 0
|
||||
else
|
||||
MKSHLIB = /usr/lpp/xlC/bin/makeC++SharedLib_r -p 0
|
||||
MKSHLIB = makeC++SharedLib_r -p 0
|
||||
endif
|
||||
OS_LIBS += -ldl
|
||||
endif
|
||||
|
@ -78,11 +78,7 @@ endif
|
||||
|
||||
# AIX
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
ifeq ($(CLASSIC_NSPR),1)
|
||||
LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lpp/xlC/lib:/usr/lib:/lib
|
||||
else
|
||||
LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
|
||||
endif
|
||||
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
|
||||
ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
|
||||
LIBPR = -lnspr$(MOD_VERSION)_shr
|
||||
LIBPRSTRMS = -lprstrms$(MOD_VERSION)_shr
|
||||
|
@ -76,7 +76,7 @@ endif
|
||||
|
||||
# AIX
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
|
||||
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
|
||||
LIBPR = -lnspr$(MOD_VERSION)_shr
|
||||
LIBPLC = -lplc$(MOD_VERSION)_shr
|
||||
endif
|
||||
|
@ -126,11 +126,7 @@ endif
|
||||
|
||||
# AIX
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
ifeq ($(CLASSIC_NSPR),1)
|
||||
LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lpp/xlC/lib:/usr/lib:/lib
|
||||
else
|
||||
LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
|
||||
endif
|
||||
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
|
||||
ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
|
||||
LIBPR = -lnspr$(MOD_VERSION)_shr
|
||||
LIBPLC = -lplc$(MOD_VERSION)_shr
|
||||
|
@ -230,11 +230,7 @@ endif
|
||||
|
||||
# AIX
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
ifeq ($(CLASSIC_NSPR),1)
|
||||
LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lpp/xlC/lib:/usr/lib:/lib
|
||||
else
|
||||
LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
|
||||
endif
|
||||
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
|
||||
ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
|
||||
LIBPR = -lnspr$(MOD_VERSION)_shr
|
||||
LIBPLC = -lplc$(MOD_VERSION)_shr
|
||||
|
@ -82,7 +82,7 @@ endif
|
||||
|
||||
# AIX
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
|
||||
LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
|
||||
LIBPR = -lnspr$(NSPR_VERSION)_shr
|
||||
LIBPLC = -lplc$(NSPR_VERSION)_shr
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user