JehanneOS
/
devtools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

gcc: remove APW from config/jehanne.h; adjust init.sh to include it on make

This commit is contained in:
Giacomo Tesio 2019-12-16 01:02:15 +01:00
parent 200961ec7c
commit ba1541c359
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cross/init.sh
View File

@ -116,15 +116,15 @@ mkdir -p $GCC_BUILD_DIR
( cd gcc && ./contrib/download_prerequisites ) && ( cd gcc && ./contrib/download_prerequisites ) &&
( cd gcc/libstdc++-v3 && autoconf -i ) && ( cd gcc/libstdc++-v3 && autoconf -i ) &&
cd $GCC_BUILD_DIR && cd $GCC_BUILD_DIR &&
$WORKING_DIR/src/gcc/configure --target=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE --enable-languages=c,c++ --without-isl --disable-nls && $WORKING_DIR/src/gcc/configure --target=x86_64-jehanne --prefix=/posix --with-sysroot=$JEHANNE --enable-languages=c,c++ --without-isl --disable-nls &&
make all-gcc all-target-libgcc && make CFLAGS_FOR_TARGET="-I$JEHANNE/sys/include/apw" all-gcc all-target-libgcc &&
make DESTDIR=$WORKING_DIR/cross install-gcc install-target-libgcc make DESTDIR=$WORKING_DIR/cross install-gcc install-target-libgcc
) >> $LOG 2>&1 ) >> $LOG 2>&1
failOnError $? "building gcc" failOnError $? "building gcc"
echo done. echo done.
echo -n Copying GCC includes into $JEHANNE/posix... ## TODO: get a sense of this... shouldn't we do this after GCC compilation?
mkdir -p $JEHANNE/posix/lib #echo -n Copying GCC includes into $JEHANNE/posix...
cp -fpr $WORKING_DIR/cross/posix/lib/* $JEHANNE/posix/lib #mkdir -p $JEHANNE/posix/lib
cp -fpr $WORKING_DIR/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include-fixed/* $JEHANNE/posix/lib/gcc/x86_64-jehanne/9.2.0/include/ #cp -fpr $WORKING_DIR/cross/posix/lib/* $JEHANNE/posix/lib
echo done. #echo done.

16
cross/patch/gcc/gcc/config/jehanne.h
View File

@ -1,7 +1,7 @@
/* /*
* This file is part of Jehanne. * This file is part of Jehanne.
* *
* Copyright (C) 2016-2019 Giacomo Tesio <giacomo@tesio.it> * Copyright (C) 2016-2020 Giacomo Tesio <giacomo@tesio.it>
* *
* Jehanne is free software: you can redistribute it and/or modify * Jehanne is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -28,28 +28,16 @@
#undef MD_STARTFILE_PREFIX #undef MD_STARTFILE_PREFIX
#define MD_STARTFILE_PREFIX "/arch/amd64/lib/" #define MD_STARTFILE_PREFIX "/arch/amd64/lib/"
/*
#undef GPLUSPLUS_INCLUDE_DIR
#define GPLUSPLUS_INCLUDE_DIR "/posix/g++"
#undef GCC_INCLUDE_DIR
#define GCC_INCLUDE_DIR "/posix/gcc"
*/
/* Architecture specific header (u.h) goes here (from config.gcc) */ /* Architecture specific header (u.h) goes here (from config.gcc) */
#define ARCH_INCLUDE_DIR NATIVE_SYSTEM_HEADER_DIR #define ARCH_INCLUDE_DIR NATIVE_SYSTEM_HEADER_DIR
/* The default include dir is /sys/include but... */ /* The default include dir is /sys/include */
#define PORTABLE_INCLUDE_DIR "/sys/include" #define PORTABLE_INCLUDE_DIR "/sys/include"
/* ...we have to wrap libc.h and stdio.h with basic POSIX headers */
#define BASIC_POSIX_INCLUDE_DIR "/sys/include/apw"
#undef INCLUDE_DEFAULTS #undef INCLUDE_DEFAULTS
#define INCLUDE_DEFAULTS \ #define INCLUDE_DEFAULTS \
{ \ { \
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 }, \
{ GCC_INCLUDE_DIR, "GCC", 0, 0, 1, 0 }, \
{ BASIC_POSIX_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \
{ PORTABLE_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \ { PORTABLE_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \
{ ARCH_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \ { ARCH_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \
{ 0, 0, 0, 0, 0, 0 } \ { 0, 0, 0, 0, 0, 0 } \