diff options
| author | wtc <devnull@localhost> | 1998-05-07 07:23:49 +0000 |
|---|---|---|
| committer | wtc <devnull@localhost> | 1998-05-07 07:23:49 +0000 |
| commit | 429db406b1d246ada91995b5d901596fabc43063 (patch) | |
| tree | 077dd1438d84f1d3270d4dd7f87e3a27dbddea36 | |
| parent | 351d399dbe5a4eaeb933c80435c774a173aa565d (diff) | |
| download | nspr-hg-429db406b1d246ada91995b5d901596fabc43063.tar.gz | |
Moved Rhapsody's shared library rule from rules.mk to Rhapsody.mk.
| -rw-r--r-- | config/Rhapsody.mk | 3 | ||||
| -rw-r--r-- | config/rules.mk | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/config/Rhapsody.mk b/config/Rhapsody.mk index b42bd23c..3436b8ae 100644 --- a/config/Rhapsody.mk +++ b/config/Rhapsody.mk @@ -41,7 +41,8 @@ ARCH = rhapsody #DSO_LDOPTS = -Bshareable #DSO_LDFLAGS = -MKSHLIB = $(CC) -arch ppc -dynamiclib -compatibility_version 1 -current_version 1 +# Do we need this?: -install_name +MKSHLIB = $(CC) -arch ppc -dynamiclib -compatibility_version 1 -current_version 1 -all_load DLL_SUFFIX = dylib #G++INCLUDES = -I/usr/include/g++ diff --git a/config/rules.mk b/config/rules.mk index b3760848..337df248 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -258,13 +258,6 @@ ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) $(LD) $(XCFLAGS) -o $@ $(OBJS) -bE:$(OBJDIR)/lib$(LIBRARY_NAME)_syms \ -bM:SRE -bnoentry $(OS_LIBS) $(EXTRA_LIBS) else -ifeq ($(OS_ARCH)$(OS_RELEASE), Rhapsody5.0) - @echo Trying to generate Rhapsody dynamic library. - # Do we need this?: -install_name - $(CC) -arch ppc -dynamiclib -compatibility_version 1 -current_version 1 -all_load $(OBJS) -o $@ - - -else ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) echo system windows dll initinstance >w16link @@ -300,7 +293,6 @@ else $(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OS_LIBS) endif endif -endif $(PURE_LIBRARY): rm -f $@ |