equal
deleted
inserted
replaced
1 --- Makefile.in 2009-12-30 10:05:40.000000000 -0800 |
|
2 +++ Makefile.in 2011-02-04 16:31:01.659698136 -0800 |
|
3 @@ -137,7 +137,7 @@ |
|
4 STATIC_LD = @STATIC_LD@ |
|
5 LOCAL_LDFLAGS = @LOCAL_LDFLAGS@ |
|
6 |
|
7 -SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS) |
|
8 +SYSTEM_FLAGS = -DPROGRAM='"$(Program)"' -DCONF_HOSTTYPE='"$(Machine)"' -DCONF_OSTYPE='"$(OS)"' -DCONF_MACHTYPE='"$(MACHTYPE)"' -DCONF_VENDOR='"$(VENDOR)"' $(LOCALE_DEFS) $(CFLAGS) |
|
9 |
|
10 BASE_CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) $(LOCAL_DEFS) \ |
|
11 $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES) |
|
12 @@ -535,7 +535,7 @@ |
|
13 |
|
14 $(Program): .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP) |
|
15 $(RM) $@ |
|
16 - $(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) |
|
17 + $(PURIFY) $(CC) $(CFLAGS) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) $(LD_OPTIONS) -s |
|
18 ls -l $(Program) |
|
19 -$(SIZE) $(Program) |
|
20 |
|
21 @@ -549,10 +549,10 @@ |
|
22 @echo |
|
23 |
|
24 bashbug: $(SUPPORT_SRC)bashbug.sh config.h Makefile $(VERSPROG) |
|
25 - @sed -e "s%!MACHINE!%$(Machine)%" -e "s%!OS!%$(OS)%" \ |
|
26 - -e "s%!CFLAGS!%$(CCFLAGS)%" -e "s%!CC!%$(CC)%" \ |
|
27 - -e "s%!RELEASE!%$(Version)%" -e "s%!PATCHLEVEL!%$(PatchLevel)%" \ |
|
28 - -e "s%!MACHTYPE!%$(MACHTYPE)%" -e "s%!RELSTATUS!%$(RELSTATUS)%" \ |
|
29 + @sed -e "s^!MACHINE!^$(Machine)^" -e "s^!OS!^$(OS)^" \ |
|
30 + -e "s^!CFLAGS!^$(CCFLAGS)^" -e "s^!CC!^$(CC)^" \ |
|
31 + -e "s^!RELEASE!^$(Version)^" -e "s^!PATCHLEVEL!^$(PatchLevel)^" \ |
|
32 + -e "s^!MACHTYPE!^$(MACHTYPE)^" -e "s^!RELSTATUS!^$(RELSTATUS)^" \ |
|
33 $(SUPPORT_SRC)bashbug.sh > $@ |
|
34 @chmod a+rx bashbug |
|
35 |
|