Changeset ecf56f80 in mainline


Ignore:
Timestamp:
2019-08-17T12:49:43Z (5 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2fff3c4
Parents:
5fd05862
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-13 11:27:48)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)
Message:

Fix tools/xcw

Location:
tools/xcw
Files:
3 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • tools/xcw/bin/helenos-cc

    r5fd05862 recf56f80  
    3232#
    3333
     34
     35
    3436XCW="$(dirname "$0")"
    3537SRC_ROOT="$XCW/../../.."
    3638if [ -z "$EXPORT_DIR" ]; then
    37         EXPORT_DIR="$SRC_ROOT/uspace/export"
     39        EXPORT_DIR="$SRC_ROOT/dist"
    3840fi
    39 UARCH="$("$XCW"/helenos-bld-config --uarch)"
    40 CC="$("$XCW"/helenos-bld-config --cc)"
    41 CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
    42 ENDIAN="$("$XCW"/helenos-bld-config --endian)"
    4341
    44 echo helenos-cc "$@"
    45 "$CC" \
    46     -O3 -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32LE -finput-charset=UTF-8 \
    47     $CFLAGS \
    48     -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
    49     -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings -ggdb \
    50     -fno-omit-frame-pointer \
    51     -D "$ENDIAN" \
    52     "$@" \
    53     -I"$XCW"/../include \
    54     -I"$EXPORT_DIR"/include/libc \
    55     -I"$EXPORT_DIR"/include
     42HELENOS_EXPORT_ROOT="$EXPORT_DIR"
     43
     44source "${EXPORT_DIR}/config/config.sh"
     45
     46# CC is a compilation driver, so we should check which stage of compilation
     47# is actually running and select which flags to provide. This makes no
     48# difference for GCC, but e.g. clang warns when a flag is provided that is
     49# unused
     50
     51needs_cflags=true
     52needs_ldflags=true
     53
     54for flag in "$@"; do
     55        case "$flag" in
     56                -E)
     57                        needs_cflags=false
     58                        needs_ldflags=false
     59                        break
     60                        ;;
     61                -c|-S)
     62                        needs_ldflags=false
     63                        break
     64                        ;;
     65        esac
     66done
     67
     68flags="-fwide-exec-charset=UTF-32LE -finput-charset=UTF-8 -fexec-charset=UTF-8"
     69flags="$flags -isystem ${HELENOS_EXPORT_ROOT}/include/libc -idirafter ${HELENOS_EXPORT_ROOT}/include"
     70
     71if $needs_cflags; then
     72        flags="$flags -O3 \
     73            -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
     74            -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings -ggdb"
     75
     76        flags="$flags $HELENOS_CFLAGS"
     77fi
     78
     79if $needs_ldflags; then
     80        flags="$flags $HELENOS_LDFLAGS"
     81fi
     82
     83flags="$flags $@"
     84
     85if $needs_ldflags; then
     86        flags="$flags $HELENOS_LDLIBS"
     87fi
     88
     89echo "helenos-cc" "$@"
     90PATH="$HELENOS_CROSS_PATH:$PATH" "${HELENOS_TARGET}-gcc" $flags

  • tools/xcw/bin/helenos-pkg-config

    r5fd05862 recf56f80  
    3434XCW="$(dirname "$0")"
    3535SRC_ROOT="$XCW/../../.."
    36 UARCH="$("$XCW"/helenos-bld-config --uarch)"
    3736if [ -z "$EXPORT_DIR" ]; then
    38         EXPORT_DIR="$SRC_ROOT/uspace/export"
     37        EXPORT_DIR="$SRC_ROOT/dist"
    3938fi
    4039INCLUDE_DIR="$EXPORT_DIR/include"

  • tools/xcw/demo/Makefile

    r5fd05862 recf56f80  
    5757
    5858$(output): $(objects)
    59         $(LD) -o $@ $^ $(LIBS)
     59        $(CC) -o $@ $^ $(LIBS)
    6060
    6161%.o: %.c
Note: See TracChangeset for help on using the changeset viewer.