diff options
Diffstat (limited to 'moz/zipped/makefile.mk')
| -rw-r--r-- | moz/zipped/makefile.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk index 0f1fe2c503bd..a08561e1c86c 100644 --- a/moz/zipped/makefile.mk +++ b/moz/zipped/makefile.mk @@ -170,9 +170,6 @@ FREEBL=freebl3 FREEBL=freebl3 .ENDIF # "$(OS)" == "SOLARIS" - -#On Linux/Unix sqlite is delivered to $(SOLARLIBDIR)/sqlite/libsqlite3.so -#See readme.txt in module nss NSS_MODULE_RUNTIME_LIST:= \ $(FREEBL) \ nspr4 \ @@ -184,9 +181,16 @@ NSS_MODULE_RUNTIME_LIST:= \ plds4 \ smime3 \ softokn3 \ - sqlite/sqlite3 \ ssl3 +# On Linux/Unix sqlite is delivered to $(SOLARLIBDIR)/sqlite/libsqlite3.so (see +# nss/README) and for Mac OS X >= 10.6 the system lib is used instead (see +# nss/makefile.mk): +.IF "$(OS)" == "MACOSX" && "$(MAC_OS_X_VERSION_MIN_REQUIRED)" >= "1060" +.ELSE +NSS_MODULE_RUNTIME_LIST += sqlite/sqlite3 +.END + # Remove the nss libs build in moz and those build in the nss module $(MISC)$/replace_old_nss_libs : $(MISC)$/unpacked_$(TARGET)_lib \ $(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip |