Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
82e82971
Commit
82e82971
authored
Dec 01, 2016
by
Alexey Golubev
Committed by
GitHub
Dec 01, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed architecture detection for linux and macos
parent
4b8c2b4f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
Makefile
Makefile
+9
-7
No files found.
Makefile
View file @
82e82971
...
@@ -13,27 +13,29 @@ ifeq ($(OS),Windows_NT)
...
@@ -13,27 +13,29 @@ ifeq ($(OS),Windows_NT)
endif
endif
else
else
UNAME_S
:=
$(
shell
uname
-s
)
UNAME_S
:=
$(
shell
uname
-s
)
UNAME_P
:=
$(
shell
uname
-p
)
ifeq
($(UNAME_S),Linux)
ifeq
($(UNAME_S),Linux)
PLATFORM
:=
linux
PLATFORM
:=
linux
SHARED_EXT
:=
.so
*
SHARED_EXT
:=
.so
*
SHELL_EXT
:=
.sh
SHELL_EXT
:=
.sh
LIB_EXT
:=
.a
LIB_EXT
:=
.a
MAKE
:=
make
-j
$(
shell
grep
-c
^processor /proc/cpuinfo
)
MAKE
:=
make
-j
$(
shell
grep
-c
^processor /proc/cpuinfo
)
ifeq
($(UNAME_P),x86_64)
ARCHITECTURE
:=
64
endif
ifneq
($(filter %86,$(UNAME_P)),)
ARCHITECTURE
:=
32
endif
endif
endif
ifeq
($(UNAME_S),Darwin)
ifeq
($(UNAME_S),Darwin)
PLATFORM
:=
mac
PLATFORM
:=
mac
ARCHITECTURE
:=
64
SHARED_EXT
:=
.dylib
*
SHARED_EXT
:=
.dylib
*
SHELL_EXT
:=
.sh
SHELL_EXT
:=
.sh
LIB_EXT
:=
.a
LIB_EXT
:=
.a
MAKE
:=
make
-j
$(
shell
sysctl
-n
hw.ncpu
)
MAKE
:=
make
-j
$(
shell
sysctl
-n
hw.ncpu
)
endif
endif
UNAME_P
:=
$(
shell
uname
-p
)
ifeq
($(UNAME_P),x86_64)
ARCHITECTURE
:=
64
endif
ifneq
($(filter %86,$(UNAME_P)),)
ARCHITECTURE
:=
32
endif
endif
endif
TARGET
:=
$(PLATFORM)
_
$(ARCHITECTURE)
TARGET
:=
$(PLATFORM)
_
$(ARCHITECTURE)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment