diff options
| author | wtc%google.com <devnull@localhost> | 2012-12-08 05:43:26 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2012-12-08 05:43:26 +0000 |
| commit | b53c80c70cf4a17a5545bb7dd2b671fa426030f7 (patch) | |
| tree | f543b2d31f89cbf9756572454a4f964457d752f4 | |
| parent | 1fd6a1207da10b93bdc5d8df1e9f37d52a43f747 (diff) | |
| download | nss-hg-b53c80c70cf4a17a5545bb7dd2b671fa426030f7.tar.gz | |
Bug 611451: Use the -exported_symbols_list linker option instead of the
nmedit command. r=bsmith,rrelyea.
Modified Files:
Darwin.mk rules.mk
| -rw-r--r-- | security/coreconf/Darwin.mk | 3 | ||||
| -rw-r--r-- | security/coreconf/rules.mk | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/security/coreconf/Darwin.mk b/security/coreconf/Darwin.mk index d455cbd24..f0002c6f8 100644 --- a/security/coreconf/Darwin.mk +++ b/security/coreconf/Darwin.mk @@ -108,6 +108,9 @@ DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS) DLL_SUFFIX = dylib +ifdef MAPFILE + MKSHLIB += -exported_symbols_list $(MAPFILE) +endif PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@ diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index 6443fd2e4..937eed4ed 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -308,11 +308,6 @@ endif else $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) chmod +x $@ -ifeq ($(OS_TARGET),Darwin) -ifdef MAPFILE - nmedit -s $(MAPFILE) $@ -endif -endif endif endif |