878866 - moz.build: verify CONFIG['ABI'] setup

Status: RESOLVED INVALID

(Firefox Build System :: General, defect)

Description

[Joey Armstrong [:joey]]

>diff --git a/memory/jemalloc/src/moz.build b/memory/jemalloc/src/moz.build
>new file mode 100644
>--- /dev/null
>+++ b/memory/jemalloc/src/moz.build
>@@ -0,0 +1,35 @@
>+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
>+# vim: set filetype=python:
>+# This Source Code Form is subject to the terms of the Mozilla Public
>+# License, v. 2.0. If a copy of the MPL was not distributed with this
>+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
>+
>+
>+if CONFIG['ABI'] == 'macho':
>+    CSRCS += [
>+        'src/zone.c',
>+    ]

Is ABI an actual config variable? It doesn't show up in my autoconf.mk, but maybe it is platform specific.

Comment 1

[(not currently active) Ted Mielczarek]

No, that's not a thing that exists:
http://mxr.mozilla.org/mozilla-central/search?string=ABI&case=1&find=configure\.in&findi=&filter=^[^\0]*%24&hitlimit=&tree=mozilla-central

There's TARGET_XPCOM_ABI, but that would never have that value.

Comment 2

[(not currently active) Ted Mielczarek]

Actually wait, confusing:
http://mxr.mozilla.org/mozilla-central/source/memory/jemalloc/src/configure#4457

I think jemalloc gets built as a standalone project now, so we shouldn't be touching anything under jemalloc/src.

Comment 3

[Mike Hommey [:glandium]]

Yes, memory/jemalloc/src should stay as it is. Rule of thumb: if there is no moz.build already in a given directory, you shouldn't touch Makefiles.

Comment 4

[Joey Armstrong [:joey]]

(In reply to Mike Hommey (high latency until June 25) [:glandium] from comment #3)
> Yes, memory/jemalloc/src should stay as it is. Rule of thumb: if there is no
> moz.build already in a given directory, you shouldn't touch Makefiles.

We should at least have a bug on file to revisit this so the makefiles can eventually be deprecated.

Comment 5

[Mike Hommey [:glandium]]

(In reply to Joey Armstrong [:joey] from comment #4)
> We should at least have a bug on file to revisit this so the makefiles can
> eventually be deprecated.

Everything under memory/jemalloc/src is a plain copy of the upstream jemalloc source. We're not going to change these files.
And, they're not used anyways, because we use our own Makefile in memory/jemalloc.