Skip to content

Commit 81ccc53

Browse files
committed
- Set linker for OSX qtclients
- Fix compilation on OSX/g++-4.5 git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8830 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent f6e0140 commit 81ccc53

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

configure

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5045,10 +5045,9 @@ $as_echo_n "checking for qmake arguments... " >&6; }
50455045
echo 'if test -z "$MAKEFILE"; then MAKEFILE=Makefile; fi' >> ./qmake.sh
50465046
# echo 'echo $MAKEFILE' >> ./qmake.sh
50475047
echo 'cat $MAKEFILE | \
5048-
sed "s/-arch i386/OMC_ARCH_i386/g" | \
5049-
sed "s/-arch x86_64/OMC_ARCH_x86_64/g" | \
5050-
sed "s/-arch//g" | \
5051-
sed "s/OMC_ARCH_/-arch /" > $MAKEFILE.fixed && \
5048+
sed "s/-arch i386//g" | \
5049+
sed "s/-arch x86_64//g" | \
5050+
sed "s/-arch//g" > $MAKEFILE.fixed && \
50525051
mv $MAKEFILE.fixed $MAKEFILE' >> qmake.sh
50535052
QMAKE="sh `pwd`/qmake.sh"
50545053
fi

configure.in

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,9 @@ if test -n "$QMAKE"; then
343343
echo 'if test -z "$MAKEFILE"; then MAKEFILE=Makefile; fi' >> ./qmake.sh
344344
# echo 'echo $MAKEFILE' >> ./qmake.sh
345345
echo 'cat $MAKEFILE | \
346-
sed "s/-arch i386/OMC_ARCH_i386/g" | \
347-
sed "s/-arch x86_64/OMC_ARCH_x86_64/g" | \
348-
sed "s/-arch//g" | \
349-
sed "s/OMC_ARCH_/-arch /" > $MAKEFILE.fixed && \
346+
sed "s/-arch i386//g" | \
347+
sed "s/-arch x86_64//g" | \
348+
sed "s/-arch//g" > $MAKEFILE.fixed && \
350349
mv $MAKEFILE.fixed $MAKEFILE' >> qmake.sh
351350
QMAKE="sh `pwd`/qmake.sh"
352351
fi

0 commit comments

Comments
 (0)