Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
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
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Main
Synchronet
Commits
357fd0cb
Commit
357fd0cb
authored
6 months ago
by
Deucе
Browse files
Options
Downloads
Patches
Plain Diff
Add support for fat Darwin builds...
Using FAT=1 one the make command-line
parent
12857f64
No related branches found
No related tags found
No related merge requests found
Pipeline
#6638
passed
6 months ago
Stage: build
Stage: test
Stage: cleanup
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
3rdp/build/GNUmakefile
+8
-0
8 additions, 0 deletions
3rdp/build/GNUmakefile
src/build/Common.gmake
+4
-0
4 additions, 0 deletions
src/build/Common.gmake
with
12 additions
and
0 deletions
3rdp/build/GNUmakefile
+
8
−
0
View file @
357fd0cb
...
...
@@ -196,10 +196,18 @@ ifeq ($(os),win64)
else
ifdef
MINGW32
$(
QUIET
)
cd
$(
CRYPT_SRC
)
&&
env
-
PATH
=
"
$(
PATH
)
"
CC
=
"
$(
CC
)
"
AR
=
"
$(
AR
)
"
RANLIB
=
"
$(
RANLIB
)
"
make target-mingw
else
ifeq
($(os),darwin)
ifdef
FAT
$(
QUIET
)
cd
$(
CRYPT_SRC
)
&&
env
-
PATH
=
"
$(
PATH
)
"
CC
=
"
$(
CC
)
"
AR
=
"
$(
AR
)
"
RANLIB
=
"
$(
RANLIB
)
"
make
BUILDOPTS
=
"-arch x86_64 -arch arm64"
else
$(
QUIET
)
cd
$(
CRYPT_SRC
)
&&
env
-
PATH
=
"
$(
PATH
)
"
CC
=
"
$(
CC
)
"
AR
=
"
$(
AR
)
"
RANLIB
=
"
$(
RANLIB
)
"
make
endif
else
$(
QUIET
)
cd
$(
CRYPT_SRC
)
&&
env
-
PATH
=
"
$(
PATH
)
"
CC
=
"
$(
CC
)
"
AR
=
"
$(
AR
)
"
RANLIB
=
"
$(
RANLIB
)
"
make
endif
endif
endif
endif
$(
QUIET
)
cp
$(
CRYPT_SRC
)
/libcl.a
$(
CRYPT_IDIR
)
$(
QUIET
)
cp
$(
CRYPT_SRC
)
/cryptlib.h
$(
CRYPT_IDIR
)
This diff is collapsed.
Click to expand it.
src/build/Common.gmake
+
4
−
0
View file @
357fd0cb
...
...
@@ -253,6 +253,10 @@ ifndef win
endif
ifeq ($(os),darwin)
ifdef FAT
CFLAGS += -arch x86_64 -arch arm64
LDFLAGS += -arch x86_64 -arch arm64
endif
ifeq ("$(machine_uname)","")
ifeq ($(shell sysctl hw.optional.x86_64),hw.optional.x86_64: 1)
machine_uname := x86_64
...
...
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