Changeset 7ab6fc2 in mainline


Ignore:
Timestamp:
2011-04-09T19:15:26Z (13 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:
40ef3ed
Parents:
2e08dce
Message:

setting POSIX_COMPAT=1 in the makefile now makes compat headers preferred and links with libcompat

Location:
uspace
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile.common

    r2e08dce r7ab6fc2  
    154154JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
    155155
     156ifeq ($(POSIX_COMPAT),1)
     157        CFLAGS = -I$(LIBCOMPAT_PREFIX)
     158        LIBS += $(LIBCOMPAT_PREFIX)/libcompat.a
     159endif
     160
    156161ifeq ($(COMPILER),gcc_cross)
    157         CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     162        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
    158163        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    159164endif
    160165
    161166ifeq ($(COMPILER),gcc_native)
    162         CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     167        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
    163168        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    164169endif
    165170
    166171ifeq ($(COMPILER),icc)
    167         CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
     172        CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
    168173        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    169174endif
    170175
    171176ifeq ($(COMPILER),clang)
    172         CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
     177        CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
    173178        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    174179endif
  • uspace/app/pcc/cc/cpp/Makefile

    r2e08dce r7ab6fc2  
    2727#
    2828
    29 # TODO: prefer libcompat headers to libc
    30 
    3129ARCH = i386  # FIXME: figure out the real arch
    3230
    3331USPACE_PREFIX = ../../../..
    34 LIBS = $(LIBCOMPAT_PREFIX)/libcompat.a
    3532MIPDIR = ../../mip
    3633ARCHDIR = ../../arch/$(ARCH)
    37 EXTRA_CFLAGS = -I$(LIBCOMPAT_PREFIX) -I$(MIPDIR) -I$(ARCHDIR)
     34EXTRA_CFLAGS = -I$(MIPDIR) -I$(ARCHDIR)
    3835EXTRA_CLEAN = y.tab.c y.tab.h
    3936DEFS = -DCPP_DEBUG -Dfree=free -DCPPBUF=16384
    4037BINARY = cpp
     38
     39POSIX_COMPAT = 1
    4140
    4241YACC = yacc
  • uspace/app/pcc/cc/cpp/cpp.c

    r2e08dce r7ab6fc2  
    3737#include <sys/wait.h>
    3838#endif
    39 #include <compat/sys/stat.h>
     39#include <sys/stat.h>
    4040
    4141#include <fcntl.h>
    4242#ifdef HAVE_UNISTD_H
    43 #include <compat/unistd.h>
     43#include <unistd.h>
    4444#endif
    4545#include <stdio.h>
     
    4747#include <stdlib.h>
    4848#include <string.h>
    49 #include <compat/time.h>
     49#include <time.h>
    5050#include <ctype.h>
    5151
  • uspace/app/pcc/cc/cpp/token.c

    r2e08dce r7ab6fc2  
    4545#include <stdlib.h>
    4646#include <string.h>
    47 #include <compat/ctype.h>
     47#include <ctype.h>
    4848#ifdef HAVE_UNISTD_H
    4949#include <unistd.h>
  • uspace/lib/compat/ctype.h

    r2e08dce r7ab6fc2  
    3030#define COMPAT_CTYPE_H
    3131
    32 #include <ctype.h>
     32#include "../c/include/ctype.h"
    3333
    3434extern int isxdigit(int ch);
  • uspace/lib/compat/sys/stat.h

    r2e08dce r7ab6fc2  
    33#define COMPAT_STAT_H
    44
    5 #include <sys/stat.h>
     5#include "../../c/include/sys/stat.h"
    66#include "time.h"
    77
  • uspace/lib/compat/time.h

    r2e08dce r7ab6fc2  
    3030#define COMPAT_TIME_H
    3131
    32 #include <time.h>
     32#include "../c/include/time.h"
    3333
    3434struct tm {
  • uspace/lib/compat/unistd.h

    r2e08dce r7ab6fc2  
    3030#define COMPAT_UNISTD_H
    3131
     32#include "../c/include/unistd.h"
     33
    3234//#include <getopt.h>
    3335
Note: See TracChangeset for help on using the changeset viewer.