diff options
| author | Sage Weil <sage@inktank.com> | 2014-05-16 07:33:11 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2014-05-16 07:33:11 -0700 |
| commit | dcf98ff04bc5dacd5d45854a32870d86dd7b26c7 (patch) | |
| tree | 5af6c5d2544bc070975479fe926807df5c7634be /GNUmakefile | |
| parent | 9dc3a9c683385abfe4ad92b7c6ff30719acc3c13 (diff) | |
| parent | 2f602bce782be221a729a74df1258fdf896e633b (diff) | |
| download | ceph-libs3-master.tar.gz | |
Some fixes from SCA runs
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/GNUmakefile b/GNUmakefile index 7a74ec3..f387e30 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -91,6 +91,11 @@ ifndef DESTDIR DESTDIR := /usr endif +# -------------------------------------------------------------------------- +# Compiler CC handling +ifndef CC + CC := gcc +endif # -------------------------------------------------------------------------- # Acquire configuration information for libraries that libs3 depends upon @@ -205,18 +210,18 @@ uninstall: $(BUILD)/obj/%.o: src/%.c $(QUIET_ECHO) $@: Compiling object @ mkdir -p $(dir $(BUILD)/dep/$<) - @ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \ + @ $(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \ -o $(BUILD)/dep/$(<:%.c=%.d) -c $< @ mkdir -p $(dir $@) - $(VERBOSE_SHOW) gcc $(CFLAGS) -o $@ -c $< + $(VERBOSE_SHOW) $(CC) $(CFLAGS) -o $@ -c $< $(BUILD)/obj/%.do: src/%.c $(QUIET_ECHO) $@: Compiling dynamic object @ mkdir -p $(dir $(BUILD)/dep/$<) - @ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \ + @ $(CC) $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \ -o $(BUILD)/dep/$(<:%.c=%.dd) -c $< @ mkdir -p $(dir $@) - $(VERBOSE_SHOW) gcc $(CFLAGS) -fpic -fPIC -o $@ -c $< + $(VERBOSE_SHOW) $(CC) $(CFLAGS) -fpic -fPIC -o $@ -c $< # -------------------------------------------------------------------------- @@ -236,7 +241,7 @@ LIBS3_SOURCES := acl.c bucket.c error_parser.c general.c \ $(LIBS3_SHARED): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.do) $(QUIET_ECHO) $@: Building shared library @ mkdir -p $(dir $@) - $(VERBOSE_SHOW) gcc -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \ + $(VERBOSE_SHOW) $(CC) -shared -Wl,-soname,libs3.so.$(LIBS3_VER_MAJOR) \ -o $@ $^ $(LDFLAGS) $(LIBS3_STATIC): $(LIBS3_SOURCES:%.c=$(BUILD)/obj/%.o) @@ -254,7 +259,7 @@ s3: $(BUILD)/bin/s3 $(BUILD)/bin/s3: $(BUILD)/obj/s3.o $(LIBS3_SHARED) $(QUIET_ECHO) $@: Building executable @ mkdir -p $(dir $@) - $(VERBOSE_SHOW) gcc -o $@ $^ $(LDFLAGS) + $(VERBOSE_SHOW) $(CC) -o $@ $^ $(LDFLAGS) # -------------------------------------------------------------------------- @@ -278,7 +283,7 @@ test: $(BUILD)/bin/testsimplexml $(BUILD)/bin/testsimplexml: $(BUILD)/obj/testsimplexml.o $(LIBS3_STATIC) $(QUIET_ECHO) $@: Building executable @ mkdir -p $(dir $@) - $(VERBOSE_SHOW) gcc -o $@ $^ $(LIBXML2_LIBS) + $(VERBOSE_SHOW) $(CC) -o $@ $^ $(LIBXML2_LIBS) # -------------------------------------------------------------------------- |