Skip to content

macOS / Darwin: Restore previous LDFLAGS value and prevent multiple -Wl. #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Blady-Com wants to merge 1 commit into from
Closed

macOS / Darwin: Restore previous LDFLAGS value and prevent multiple -Wl. #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,7 +2127,7 @@ fi
BUILD_SHARED=yes
fi
SO_OPTS="-Wl,-undefined,dynamic_lookup -dynamiclib -Wl,-dylib_install_name,"
LDFLAGS="-Wl,-framework,Cocoa"
LDFLAGS="-Wl,-framework,Cocoa $LDFLAGS"
TARGET_LFLAGS="-Wl,-framework,Cocoa"
;;
# ??? The following case has been introduced because of an elaboration
Expand Down Expand Up @@ -3615,14 +3615,17 @@ $as_echo "yes" >&6; }
fi



gcc_version=$($CC --version | head -1)

value=$GTK_CFLAGS

# Special handling on darwin for gcc 4.5 and 4.7
case "$build_os" in
*darwin*)
value=`echo $value | sed -e "s/-framework \([^ ]*\)/-Wl,-framework -Wl,\1/g"`
case $gcc_version in
*4.5* | *4.7*)
value=`echo $value | sed -e "s/-framework \([^ ]*\)/-Wl,-framework -Wl,\1/g"`
esac
esac

output=GTK_CFLAGS_GPR
Expand All @@ -3648,7 +3651,10 @@ $as_echo "yes" >&6; }
# Special handling on darwin for gcc 4.5 and 4.7
case "$build_os" in
*darwin*)
value=`echo $value | sed -e "s/-framework \([^ ]*\)/-Wl,-framework -Wl,\1/g"`
case $gcc_version in
*4.5* | *4.7*)
value=`echo $value | sed -e "s/-framework \([^ ]*\)/-Wl,-framework -Wl,\1/g"`
esac
esac

output=GTK_LIBS_GPR
Expand Down Expand Up @@ -3864,7 +3870,10 @@ $as_echo "$have_MesaGL_pthread" >&6; }
# Special handling on darwin for gcc 4.5 and 4.7
case "$build_os" in
*darwin*)
value=`echo $value | sed -e "s/-framework \([^ ]*\)/-Wl,-framework -Wl,\1/g"`
case $gcc_version in
*4.5* | *4.7*)
value=`echo $value | sed -e "s/-framework \([^ ]*\)/-Wl,-framework -Wl,\1/g"`
esac
esac

output=GL_LIBS_GPR
Expand All @@ -3884,7 +3893,10 @@ $as_echo "$have_MesaGL_pthread" >&6; }
# Special handling on darwin for gcc 4.5 and 4.7
case "$build_os" in
*darwin*)
value=`echo $value | sed -e "s/-framework \([^ ]*\)/-Wl,-framework -Wl,\1/g"`
case $gcc_version in
*4.5* | *4.7*)
value=`echo $value | sed -e "s/-framework \([^ ]*\)/-Wl,-framework -Wl,\1/g"`
esac
esac

output=GL_CFLAGS_GPR
Expand Down