Skip to content

Commit

Permalink
Use LD:= $(CC) in common makefile rules for win32:
Browse files Browse the repository at this point in the history
1) this better fits the intention
2) this is extensible to other compilers, for example make CC=clang or make CC=i686-w64-mingw32-gcc
  • Loading branch information
nicolas-cellier-aka-nice committed Jun 30, 2016
1 parent 96d8aa3 commit c0f738b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.win32x86/common/Makefile
Expand Up @@ -156,7 +156,7 @@ INCLUDES:= -I. -I$(VMSRCDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC)
# The switch '-mwindows' gives us a GUI app instead of a console app.
# Newer cygwins want --export-all-symbols in place of --export-dynamic.
#
LD:= gcc
LD:= $(CC)
EXPORT:=--export-dynamic
#EXPORT:=--export-all-symbols
BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw
Expand Down
2 changes: 1 addition & 1 deletion build.win32x86/common/Makefile.rules
Expand Up @@ -11,7 +11,7 @@
#
CC := gcc
CXX:= g++
LD := gcc
LD := $(CC)
LDCXX := clang++ # For linking c++ bundles

DEPFLAGS = -MT $@ -MMD -MP -MF deps/$(*F).Td
Expand Down

0 comments on commit c0f738b

Please sign in to comment.