diff options
| author | Moonchild <moonchild@palemoon.org> | 2023-11-13 00:26:23 +0100 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2023-11-13 00:26:23 +0100 |
| commit | 9816215ea7461dfbb1707809344b5d569ad615e3 (patch) | |
| tree | afe32b0c27473c574e752f67b3cebb533b54efd1 | |
| parent | 294698153c7adf63ceb3c81513ae68e888ae9f20 (diff) | |
| download | uxp-9816215ea7461dfbb1707809344b5d569ad615e3.tar.gz | |
Issue #2381 - Remove system-nspr/nss leftovers
Resolves #2381
| -rw-r--r-- | config/external/nspr/pr/moz.build | 2 | ||||
| -rw-r--r-- | old-configure.in | 11 | ||||
| -rw-r--r-- | security/generate_mapfile.py | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/config/external/nspr/pr/moz.build b/config/external/nspr/pr/moz.build index c043bfe0be..8741d90788 100644 --- a/config/external/nspr/pr/moz.build +++ b/config/external/nspr/pr/moz.build @@ -85,7 +85,7 @@ elif CONFIG['OS_TARGET'] == 'WINNT': else: DEFINES['_X86_'] = True else: - error('Not a supported OS_TARGET for NSPR in moz.build: "%s". Use --with-system-nspr' % CONFIG['OS_TARGET']) + error('Not a supported OS_TARGET for NSPR in moz.build: "%s". Cannot build.') LOCAL_INCLUDES += [ diff --git a/old-configure.in b/old-configure.in index 5c7e3c4411..cadbfb9f12 100644 --- a/old-configure.in +++ b/old-configure.in @@ -5233,17 +5233,6 @@ RC= dist=$MOZ_BUILD_ROOT/dist ac_configure_args="$_SUBDIR_CONFIG_ARGS" -# --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS -# and $NSPR_LIBS. -case "${OS_TARGET}" in - Darwin|DragonFly|FreeBSD|NetBSD|OpenBSD) - ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[^[:space:]]* *//'`" - ;; - *) - ac_configure_args="`echo $ac_configure_args | ${TOOLCHAIN_PREFIX}sed -e 's/--with-system-nspr\S* *//'`" - ;; -esac - if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'" ac_configure_args="$ac_configure_args --with-nspr-libs='$NSPR_LIBS'" diff --git a/security/generate_mapfile.py b/security/generate_mapfile.py index 3ae1de8816..4479553bf8 100644 --- a/security/generate_mapfile.py +++ b/security/generate_mapfile.py @@ -17,8 +17,6 @@ import buildconfig def main(output, input): - # There's a check in old-configure.in under the system-nss handling - # that should match this. if buildconfig.substs['OS_ARCH'] not in ('Linux', 'SunOS', 'Darwin', 'FreeBSD'): print "Error: unhandled OS_ARCH %s" % buildconfig.substs['OS_ARCH'] return 1 |