diff options
| author | bryner%netscape.com <devnull@localhost> | 2002-08-16 17:35:34 +0000 |
|---|---|---|
| committer | bryner%netscape.com <devnull@localhost> | 2002-08-16 17:35:34 +0000 |
| commit | 83e29f0efe0ffa56953b8d1c4c07d311bb6ddf8e (patch) | |
| tree | 58502bf722298b20d91b0204ca74e90e9eb76d3a | |
| parent | f4e103550df68f00e4799a223aca8f14b53a290d (diff) | |
| download | nss-hg-83e29f0efe0ffa56953b8d1c4c07d311bb6ddf8e.tar.gz | |
Sync Chimera changes with CHIMERA_M1_0_1_BRANCH (bug 161668). In addition to landing all the Chimera-specific changes here, I'm creating a new chimera.js file with our Chimera-specific prefs (and moving them out of all.js). r=brade.
| -rw-r--r-- | security/coreconf/Darwin.mk | 2 | ||||
| -rw-r--r-- | security/coreconf/rules.mk | 5 | ||||
| -rw-r--r-- | security/nss/lib/ckfw/builtins/config.mk | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/security/coreconf/Darwin.mk b/security/coreconf/Darwin.mk index 6c2b93c9d..59f5af8fd 100644 --- a/security/coreconf/Darwin.mk +++ b/security/coreconf/Darwin.mk @@ -70,5 +70,7 @@ DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_na MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) DLL_SUFFIX = dylib +PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ + sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@ G++INCLUDES = -I/usr/include/g++ diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index 76043627a..c53c1ffc5 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -364,6 +364,11 @@ endif ifeq ($(OS_TARGET),OpenVMS) @echo "`translate $@`" > $(@:$(DLL_SUFFIX)=vms) endif +ifeq ($(OS_TARGET),Darwin) +ifdef MAPFILE + nmedit -s $(MAPFILE) $@ +endif +endif endif endif diff --git a/security/nss/lib/ckfw/builtins/config.mk b/security/nss/lib/ckfw/builtins/config.mk index cccc96eb8..f9fdb5702 100644 --- a/security/nss/lib/ckfw/builtins/config.mk +++ b/security/nss/lib/ckfw/builtins/config.mk @@ -54,5 +54,5 @@ endif # To create a loadable module on Darwin, we must use -bundle. # ifeq ($(OS_TARGET),Darwin) -DSO_LDOPTS := $(subst -dynamiclib,-bundle,$(DSO_LDOPTS)) +DSO_LDOPTS = -bundle endif |