Skip to content
Snippets Groups Projects
Commit 8dfd6277 authored by Fred Wright's avatar Fred Wright Committed by Christopher Nielsen
Browse files

Fix build on 10.4 x86_64

The special treatment for 10.4 in splitandfilterandmergemultiarch was
not being applied appropriately to x86_64, causing a build failure
for fdopendir.

Fixing this bug prior to fixing the realpath() wrapper resulted in
successfully building code that didn't work correctly, though the
realpath() bug wasn't limited to this one configuration.

Note that at the time of this writing, when this case is built as a
port, the architecture is coerced to i386.  Until that is fixed, this
fix won't affect the actual port.

TESTED:
With the realpath() fix, builds successfully on all platforms,
including 10.4 x86_64.
parent b70895d1
Branches
No related tags found
No related merge requests found
...@@ -242,10 +242,7 @@ define splitandfilterandmergemultiarch ...@@ -242,10 +242,7 @@ define splitandfilterandmergemultiarch
$$(: 'On the contrary, the i386 architecture has only $$UNIX2003-compat functions for the $$INODE64 feature set.') && \ $$(: 'On the contrary, the i386 architecture has only $$UNIX2003-compat functions for the $$INODE64 feature set.') && \
$$(: '10.4 is so old that it does not even have the $$INODE64 feature.') && \ $$(: '10.4 is so old that it does not even have the $$INODE64 feature.') && \
case "$${arch}" in \ case "$${arch}" in \
('x86_64') \ ('x86_64'|'ppc64') \
$${ld} -r "$${output}.inode32.$${arch}" "$${output}.inode64.$${arch}" -o "$${output}.$${arch}"; \
;; \
('ppc64') \
if [ '9' -gt "$${platform}" ]; then \ if [ '9' -gt "$${platform}" ]; then \
$${ld} -r "$${output}.inode32.$${arch}" -o "$${output}.$${arch}"; \ $${ld} -r "$${output}.inode32.$${arch}" -o "$${output}.$${arch}"; \
else \ else \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment