Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
clean-ide
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
clean-and-itasks
clean-ide
Commits
8555dc40
Commit
8555dc40
authored
Jan 14, 2019
by
Build
Committed by
Mart Lubbers
Jan 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix support double flags for mac as well
parent
24701a6c
Pipeline
#17712
passed with stage
in 54 seconds
Changes
2
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
1282 deletions
+24
-1282
CpmMacOSX.prj
CpmMacOSX.prj
+15
-1278
MacOSX/PmCleanSystem.icl
MacOSX/PmCleanSystem.icl
+9
-4
No files found.
CpmMacOSX.prj
View file @
8555dc40
This diff is collapsed.
Click to expand it.
MacOSX/PmCleanSystem.icl
View file @
8555dc40
...
...
@@ -403,7 +403,8 @@ Link linker winfun path
applicationOptions
=:{
ss
,
hs
,
initial_heap_size
,
profiling
,
heap_size_multiple
,
o
,
memoryProfilingMinimumHeapSize
=
minheap
}
optionspathname
library_file_names
object_file_names
static_libraries
static
gen_relocs
gen_symbol_table
gen_linkmap
link_resources
resource_path
gen_dll
dll_syms
startupdir
dynlstr
_
use_64_bit_processor
ps
#
(
linker
,
linkerdir
,_)
=
get_path_name_and_options
linker
startupdir
#
(
linker
,
linkerdir
,
options1
,
options2
)
=
get_path_name_and_options2
linker
startupdir
#
flags
=
ApplicationOptionsToFlags
applicationOptions
#
optdirpath
=
RemoveFilename
optionspathname
#
((
ok
,
pd_optdirpath
),
ps
)
=
pd_StringToPath
optdirpath
ps
...
...
@@ -442,8 +443,11 @@ Link linker winfun path
#
(
err
,
ps
)
=
if
is_gcc
(
Nothing
,
ps
)
(
accFiles
(
WriteLinkOpts
linkoptspath
linkopts
)
ps
)
|
isJust
err
=
(
winfun
(
fromJust
err
)
ps
,
False
)
#
linker_args
=
if
is_gcc
[
"-s"
,
"-o"
,
path
:
[
optionspathname
:
StrictListToList
(
RemoveDup
object_file_names
)]++
StrictListToList
library_file_names
]
[
"-I"
,
linkoptspath
,
"-O"
,
linkerrspath
]
#
linker_args
=
if
is_gcc
//Options2 are for the actual linker (gcc/clang)
[
"-s"
,
"-o"
,
path
:
[
optionspathname
:
StrictListToList
(
RemoveDup
object_file_names
)]++
add_options_string_to_args
0
options2
(
StrictListToList
library_file_names
)]
//Options1 are only for clean linkers (e.g. bigger heap for the linker itself)
(
add_options_string_to_args
0
options1
[
"-I"
,
linkoptspath
,
"-O"
,
linkerrspath
])
#
(
argv
,
args_memory
)
=
make_argv
[
linker
:
linker_args
]
#
ld_pid
=
fork
|
ld_pid
<
0
...
...
@@ -680,7 +684,8 @@ errors_file_path temp_dir slot
get_path_name_and_options2
ccstring
startupdir
#
(
ccstring
,
rem
)
=
splitOptions
ccstring
(
opts
,
opts`
)
=
splitOptions
rem
cocl
=
startupdir
+++
"/"
+++
ccstring
cocl
=
if
(
ccstring
.[
0
]
==
'/'
)
ccstring
(
startupdir
+++
"/"
+++
ccstring
)
cocldir
=
RemoveFilename
cocl
=
(
cocl
,
cocldir
,
opts
,
opts`
)
...
...
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