Skip to content

Commit 2ec77a4

Browse files
authored
Merge pull request keirf#86 from davide125/cflags
build: use environment compilers and flags if defined
2 parents 14d401d + 07cd006 commit 2ec77a4

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

Rules.mk

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ INSTALL_DIR = $(INSTALL) -d -m0755 -p
2929
INSTALL_DATA = $(INSTALL) -m0644 -p
3030
INSTALL_PROG = $(INSTALL) -m0755 -p
3131

32-
AR := ar
33-
CC := gcc
34-
LD := ld
35-
OBJCOPY := objcopy
32+
AR ?= ar
33+
CC ?= gcc
34+
LD ?= ld
35+
OBJCOPY ?= objcopy
3636
RM := rm -f
3737

38-
CFLAGS = -O2
38+
LDFLAGS ?=
39+
CFLAGS ?= -O2
3940
#CFLAGS = -O0 -g
4041
CFLAGS += -fno-strict-aliasing -std=gnu99 -Wall
4142
ifneq ($(PLATFORM),win32)

libdisk/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ ifeq ($(PLATFORM),osx)
1515
SOLIB := $(SOLIB_PFX).dylib
1616
SONAME := $(SOLIB_PFX).$(MAJOR_VERSION).dylib
1717
SOVERS := $(SOLIB_PFX).$(MAJOR_VERSION).$(MINOR_VERSION).dylib
18-
LDFLAGS ?= -dynamiclib -install_name $(SONAME)
18+
LDFLAGS += -dynamiclib -install_name $(SONAME)
1919
endif
2020

2121
ifeq ($(PLATFORM),linux)
2222
SOLIB := $(SOLIB_PFX).so
2323
SONAME := $(SOLIB_PFX).so.$(MAJOR_VERSION)
2424
SOVERS := $(SOLIB_PFX).so.$(MAJOR_VERSION).$(MINOR_VERSION)
25-
LDFLAGS ?= -Wl,-h,$(SONAME) -shared
25+
LDFLAGS += -Wl,-h,$(SONAME) -shared
2626
endif
2727

2828
ifeq ($(PLATFORM),win32)
2929
SOLIB := $(SOLIB_PFX).dll
3030
SONAME := $(SOLIB_PFX).$(MAJOR_VERSION).dll
3131
SOVERS := $(SOLIB_PFX).$(MAJOR_VERSION).$(MINOR_VERSION).dll
32-
LDFLAGS ?= -Wl,-h,$(SONAME) -shared
32+
LDFLAGS += -Wl,-h,$(SONAME) -shared
3333
endif
3434

3535
LIBS :=

0 commit comments

Comments
 (0)