Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
clean-and-itasks
clean-ide
Commits
fae734ea
Commit
fae734ea
authored
Jan 14, 2019
by
John van Groningen
Browse files
Merge branch 'fix-double-flags-mbac' into 'master'
Fix double flags mbac See merge request
!7
parents
e1a45f07
8555dc40
Pipeline
#17713
passed with stage
in 52 seconds
Changes
2
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
CpmMacOSX.prj
View file @
fae734ea
This diff is collapsed.
Click to expand it.
MacOSX/PmCleanSystem.icl
View file @
fae734ea
...
...
@@ -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
,
options1
,
options2
)
=
get_path_name_and_options2
linker
""
#
(
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
)]++
add_options_string_to_args
0
options2
(
StrictListToList
library_file_names
)]
(
add_options_string_to_args
0
options1
[
"-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
Supports
Markdown
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