Skip to content

Commit

Permalink
Building 13.2.0.
Browse files Browse the repository at this point in the history
  * README.md: minor spelling, consistency.
  * common.sh (PREFIX): was set to alire-aarch64. Fixed that to use $ARCH.
      Now set to the default, /opt/gcc-$VERSION-$ARCH.
    (GCC_SRC): updated note on which version is in the source (13.2.0).
  * gcc.sh (SHIM): removed; now to be handled at runtime.
    (BUGURL): new (this repo).
    (configure): added --disable-libgomp - this is actually to suppress
      a GCC 14 issue, iains/gcc-darwin-arm64#125
      Added --with-bugurl.
  * xmlada.gpr (Object_Dir): new. Placed in a temporary directory, since
      we don't need it after the build.
  • Loading branch information
simonjwright committed Dec 10, 2023
1 parent 5b065e3 commit 40d05af
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Assuming you've got this directory in `~/building-gcc-macos-native`, all your so
make -f ~/building-gcc-macos-native/Makefile gprbuild \
VERSION=13.2.1 BOOTSTRAP=disable
```
The individual cmponents will appear in `gcc/`, `gprconfig`, `xmlada` and `gprbuild`.
The individual components will appear in `gcc/`, `gprconfig/`, `xmlada/` and `gprbuild/`.

### Additional considerations for sources ###

Expand Down
4 changes: 2 additions & 2 deletions common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TOP=/Volumes/Miscellaneous3
# PREFIX=/opt/gcc-$VERSION-20232226-$ARCH

# for gcc-for-alire, gprbuild-for-alire
PREFIX=$TOP/alire-aarch64/gcc
# PREFIX=$TOP/alire-$ARCH/gcc

# the default version
PREFIX=${PREFIX:-/opt/gcc-$VERSION-$ARCH}
Expand All @@ -29,7 +29,7 @@ SRC_PATH=$TOP/src
# that's gcc-mirror

GCC_SRC=$SRC_PATH/gcc-13-branch
# actual branch in that clone is gcc-13.1-darwin.2, i.e. 13.1.2
# actual branch in that clone is gcc-13.2-darwin.r0, i.e. 13.2.0

# GCC_SRC=$SRC_PATH/gcc-darwin-arm64
# that's iains's WIP.
Expand Down
7 changes: 2 additions & 5 deletions gcc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ XCODE=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Devel
CLT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk

SDKROOT=$(xcrun --show-sdk-path)
SHIM=/usr/local/bin/ld-shim
BUGURL=https://github.com/simonjwright/building-gcc-macos-native

echo "BUILDING THE COMPILER IN $PREFIX"

Expand All @@ -18,7 +18,6 @@ rm -rf *
$GCC_SRC/configure \
--prefix=$PREFIX \
--without-libiconv-prefix \
--disable-libgomp \
--disable-libmudflap \
--disable-libstdcxx-pch \
--disable-libsanitizer \
Expand All @@ -34,14 +33,12 @@ $GCC_SRC/configure \
--with-build-sysroot=$SDKROOT \
--with-sysroot= \
--with-specs="%{!sysroot=*:--sysroot=%:if-exists-else($XCODE $CLT)}" \
--with-bugurl=$BUGURL \
--$BOOTSTRAP-bootstrap \
--enable-host-pie \
CFLAGS=-Wno-deprecated-declarations \
CXXFLAGS=-Wno-deprecated-declarations

# --with-ld=$SHIM \
#

make -w -j7

make -w -j7 install
3 changes: 3 additions & 0 deletions xmlada.gpr
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@ project Xmlada is
Base & "/unicode",
Base & "/unicode/importer");

-- the aarch64 build didn't seem to need this; the x86_64 build does.
for Object_Dir use external ("TMPDIR") & "/xmlada";

end Xmlada;

0 comments on commit 40d05af

Please sign in to comment.