diff options
author | NeilBrown <neilb@suse.de> | 2009-05-11 08:05:41 +0200 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2009-05-11 08:05:41 +0200 |
commit | 8320878543bb5e49b5acb24fa919ff11be485c61 (patch) | |
tree | 299b6ca3d559d818f4b8dd25756c3f5feda0e91f /Makefile | |
parent | create_mddev: don't replace /dev/mdX with /dev/md/X (diff) | |
parent | re-add error check (diff) | |
download | mdadm-8320878543bb5e49b5acb24fa919ff11be485c61.tar.xz mdadm-8320878543bb5e49b5acb24fa919ff11be485c61.zip |
Merge branch 'master' into devel-3.0
Conflicts:
Build.c
mdadm.c
mdadm.h
super1.c
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -127,13 +127,13 @@ mdadm.tcc : $(SRCS) mdadm.h mdadm.klibc : $(SRCS) mdadm.h rm -f $(OBJS) - gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 $(CFLAGS) $(SRCS) + $(CC) -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 $(CFLAGS) $(SRCS) mdadm.Os : $(SRCS) mdadm.h - gcc -o mdadm.Os $(CFLAGS) -DHAVE_STDINT_H -Os $(SRCS) + $(CC) -o mdadm.Os $(CFLAGS) -DHAVE_STDINT_H -Os $(SRCS) mdadm.O2 : $(SRCS) mdadm.h - gcc -o mdadm.O2 $(CFLAGS) -DHAVE_STDINT_H -O2 $(SRCS) + $(CC) -o mdadm.O2 $(CFLAGS) -DHAVE_STDINT_H -O2 $(SRCS) mdmon : $(MON_OBJS) $(CC) $(LDFLAGS) -o mdmon $(MON_OBJS) $(LDLIBS) |