From d563c448f7971a8171c101f23e92c19aa2327a90 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 13 Mar 2006 15:19:14 +0000 Subject: r14322: Remove the BROKEN_CC flag for now. None of the buildfarm hosts has a C compiler that doesn't support -c and -o together and it makes the build system more complicated. This also means the current handling of broken C compilers is most likely broken as it isn't tested. This detection can be readded when we stumble upon a C compiler that supports both C99 (or at least the parts of it we need) and also has broken -c/-o handling, which I think is unlikely to happen. (This used to be commit 7fd74cfbb90063c79994fb6691dbe456d9ad9efa) --- source4/build/smb_build/makefile.pm | 60 ------------------------------------- 1 file changed, 60 deletions(-) (limited to 'source4/build/smb_build') diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 44e55b17f8..f17deb53f9 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -44,10 +44,6 @@ sub new($$$) $self->_prepare_path_vars(); $self->_prepare_compiler_linker(); - $self->output(".SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .so .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .8 .8.xml .ho\n"); - $self->_prepare_hostcc_rule(); - $self->_prepare_std_CC_rule("c","o",'$(PICFLAG)',"Compiling","Rule for std objectfiles"); - $self->_prepare_std_CC_rule("h","h.gch",'$(PICFLAG)',"Precompiling","Rule for precompiled headerfiles"); return $self; } @@ -167,60 +163,6 @@ sub _prepare_mk_files($) $self->output("MK_FILES = " . array2oneperline(\@tmp) . "\n"); } -sub _prepare_dummy_MAKEDIR($) -{ - my ($self) = @_; - - $self->output(<< '__EOD__' -dynconfig.o: dynconfig.c Makefile - @echo Compiling $*.c - @$(CC) $(CFLAGS) $(PICFLAG) $(PATH_FLAGS) -c $< -o $@ -__EOD__ -); - if ($self->{config}->{BROKEN_CC} eq "yes") { - $self->output(' -mv `echo $@ | sed \'s%^.*/%%g\'` $@ -'); - } - $self->output("\n"); -} - -sub _prepare_std_CC_rule($$$$$$) -{ - my ($self,$src,$dst,$flags,$message,$comment) = @_; - - $self->output(<< "__EOD__" -# $comment -.$src.$dst: - \@echo $message \$\*.$src - \@\$(CC) `script/cflags.pl \$\@` \$(CFLAGS) $flags -c \$\*.$src -o \$\@ -__EOD__ -); - if ($self->{config}->{BROKEN_CC} eq "yes") { - $self->output(' -mv `echo $@ | sed \'s%^.*/%%g\'` $@ -'); - } - - $self->output("\n"); -} - -sub _prepare_hostcc_rule($) -{ - my ($self) = @_; - - $self->output(<< "__EOD__" -.c.ho: - \@echo Compiling \$\*.c with host compiler - \@\$(HOSTCC) `script/cflags.pl \$\@` \$(CFLAGS) -c \$\*.c -o \$\@ -__EOD__ -); - if ($self->{config}->{BROKEN_CC} eq "yes") { - $self->output(' -mv `echo $@ | sed \'s%^.*/%%g\' -e \'s%\.ho$$%.o%\'` $@ -'); - } - - $self->output("\n"); -} - sub array2oneperline($) { my $array = shift; @@ -604,8 +546,6 @@ __EOD__ ); } - $self->_prepare_dummy_MAKEDIR(); - $self->output($self->{mkfile}); open(MAKEFILE,">$file") || die ("Can't open $file\n"); -- cgit