Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed hardcoded AIX pathnames /usr/lpp/xlC from the makefiles,

Browse Source 
because the new version of AIX xlC compilers (3.6.4) is installed
in a different directory (/usr/ibmcxx).


git-svn-id: svn://10.0.0.236/trunk@17384 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%netscape.com
1999-01-08 19:51:14 +00:00
parent a69758c914
commit b67bcf4843
7 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/nsprpub/lib/msgc/tests/Makefile
View File

@@ -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

6
mozilla/nsprpub/lib/prstreams/Makefile
View File

@@ -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

6
mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile
View File

@@ -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

2
mozilla/nsprpub/lib/tests/Makefile
View File

@@ -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

6
mozilla/nsprpub/pr/src/cplus/tests/Makefile
View File

@@ -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

6
mozilla/nsprpub/pr/tests/Makefile
View File

@@ -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

2
mozilla/nsprpub/tools/Makefile
View File

@@ -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