Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SteelT
SRB2
Commits
489bb81d
Commit
489bb81d
authored
4 years ago
by
James R.
Browse files
Options
Downloads
Patches
Plain Diff
Makefile: Move the PREFIX stuff up so version detection can take advantage of
parent
bf90fbb9
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Makefile.cfg
+24
-24
24 additions, 24 deletions
src/Makefile.cfg
with
24 additions
and
24 deletions
src/Makefile.cfg
+
24
−
24
View file @
489bb81d
...
@@ -21,6 +21,30 @@ SUPPORTED_GCC_VERSIONS:=\
...
@@ -21,6 +21,30 @@ SUPPORTED_GCC_VERSIONS:=\
LATEST_GCC_VERSION
=
9.1
LATEST_GCC_VERSION
=
9.1
# gcc or g++
ifdef
PREFIX
CC
=
$(
PREFIX
)
-gcc
CXX
=
$(
PREFIX
)
-g
++
OBJCOPY
=
$(
PREFIX
)
-objcopy
OBJDUMP
=
$(
PREFIX
)
-objdump
STRIP
=
$(
PREFIX
)
-strip
WINDRES
=
$(
PREFIX
)
-windres
else
OBJCOPY
=
objcopy
OBJDUMP
=
objdump
STRIP
=
strip
WINDRES
=
windres
endif
# because Apple screws with us on this
# need to get bintools from homebrew
ifdef
MACOSX
CC
=
clang
CXX
=
clang
OBJCOPY
=
gobjcopy
OBJDUMP
=
gobjdump
endif
# Automatically set version flag, but not if one was manually set
# Automatically set version flag, but not if one was manually set
ifeq
(,$(filter GCC%,$(.VARIABLES)))
ifeq
(,$(filter GCC%,$(.VARIABLES)))
ifneq
(,$(findstring GCC,$(shell $(CC) --version)))
# if it's GCC
ifneq
(,$(findstring GCC,$(shell $(CC) --version)))
# if it's GCC
...
@@ -395,30 +419,6 @@ ifdef ARCHNAME
...
@@ -395,30 +419,6 @@ ifdef ARCHNAME
BIN
:=
$(
BIN
)
/
$(
ARCHNAME
)
BIN
:=
$(
BIN
)
/
$(
ARCHNAME
)
endif
endif
# gcc or g++
ifdef
PREFIX
CC
=
$(
PREFIX
)
-gcc
CXX
=
$(
PREFIX
)
-g
++
OBJCOPY
=
$(
PREFIX
)
-objcopy
OBJDUMP
=
$(
PREFIX
)
-objdump
STRIP
=
$(
PREFIX
)
-strip
WINDRES
=
$(
PREFIX
)
-windres
else
OBJCOPY
=
objcopy
OBJDUMP
=
objdump
STRIP
=
strip
WINDRES
=
windres
endif
# because Apple screws with us on this
# need to get bintools from homebrew
ifdef
MACOSX
CC
=
clang
CXX
=
clang
OBJCOPY
=
gobjcopy
OBJDUMP
=
gobjdump
endif
OBJDUMP_OPTS
?=
--wide
--source
--line-numbers
OBJDUMP_OPTS
?=
--wide
--source
--line-numbers
LD
=
$(
CC
)
LD
=
$(
CC
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment