~ chicken-core (chicken-5) e222f506206a2480de015aecf00bd2661bd5b041
commit e222f506206a2480de015aecf00bd2661bd5b041
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Mon Jun 3 22:39:57 2024 +0200
Commit: Peter Bex <peter@more-magic.net>
CommitDate: Tue Jun 25 09:44:50 2024 +0200
drop XCODE_... env vars, assume tools are available in PATH
Signed-off-by: Peter Bex <peter@more-magic.net>
diff --git a/Makefile.macosx b/Makefile.macosx
index 59c6f374..05d8813b 100644
--- a/Makefile.macosx
+++ b/Makefile.macosx
@@ -8,11 +8,11 @@
# conditions are met:
#
# Redistributions of source code must retain the above copyright notice, this list of conditions and the following
-# disclaimer.
+# disclaimer.
# Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided with the distribution.
+# disclaimer in the documentation and/or other materials provided with the distribution.
# Neither the name of the author nor the names of its contributors may be used to endorse or promote
-# products derived from this software without specific prior written permission.
+# products derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -28,14 +28,12 @@ SRCDIR ?= ./
# platform configuration
-XCODE_DEVELOPER ?= /Applications/Xcode.app/Contents/Developer
-XCODE_TOOL_PATH ?= $(XCODE_DEVELOPER)/Toolchains/XcodeDefault.xctoolchain/usr/bin
-C_COMPILER ?= $(XCODE_DEVELOPER)/usr/bin/gcc
+C_COMPILER ?= gcc
ARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
# commands
-POSTINSTALL_PROGRAM = $(XCODE_TOOL_PATH)/install_name_tool
+POSTINSTALL_PROGRAM = install_name_tool
# options
@@ -49,7 +47,7 @@ else
C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os -fomit-frame-pointer
endif
endif
-LIBRARIAN ?= $(XCODE_TOOL_PATH)/ar
+LIBRARIAN ?= ar
LINKER_LINK_SHARED_LIBRARY_OPTIONS = -dynamiclib -compatibility_version 1 -current_version 1.0 -install_name $@
HERE = $(shell pwd)
PREINSTALL_PROGRAM_FIXUP = $(POSTINSTALL_PROGRAM) -change lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO) $(HERE)/lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(SO)
diff --git a/README b/README
index 3e17d4e6..8bfa4656 100644
--- a/README
+++ b/README
@@ -337,8 +337,8 @@ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/
| |-- libchicken.a
| |-- libchicken.dll.a (Windows)
| |-- libchicken.dylib (Macintosh)
- | |-- libchicken.so -> libchicken.so.9 (Unix)
- | `-- libchicken.so.9 (Unix)
+ | |-- libchicken.so -> libchicken.so.11 (Unix)
+ | `-- libchicken.so.11 (Unix)
`-- share
|-- chicken
| |-- doc
@@ -473,14 +473,9 @@ _/ _/ _/ _/ _/ _/ _/ _/ _/ _/_/
Mac OS X:
- - The build currently assumes the Xcode application path is
- "/Applications/Xcode.app/", with the C compiler and build
- tools being located in the "Contents/Developer/usr/bin"
- and
- "Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin"
- subdirectories, respectively. To override these locations,
- set XCODE_DEVELOPER and XCODE_TOOL_PATH on the make(3)
- command line.
+ - The build currently assumes the C toolchain is in the path,
+ use the "xcode-select(1)" tool to make them available on the
+ command line if you haven't already done so.
- CHICKEN will normally select a 32-bit or 64-bit build
automatically when you use the normal build step:
Trap